Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_sender.h

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Introduce proxy object for RtcEventLog and handle other comments. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 18 matching lines...) Expand all
29 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 29 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
30 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 30 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
31 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" 31 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
32 #include "webrtc/transport.h" 32 #include "webrtc/transport.h"
33 #include "webrtc/typedefs.h" 33 #include "webrtc/typedefs.h"
34 34
35 namespace webrtc { 35 namespace webrtc {
36 36
37 class ModuleRtpRtcpImpl; 37 class ModuleRtpRtcpImpl;
38 class RTCPReceiver; 38 class RTCPReceiver;
39 class RtcEventLog; 39 class RtcEventLogProxy;
40 40
41 class NACKStringBuilder { 41 class NACKStringBuilder {
42 public: 42 public:
43 NACKStringBuilder(); 43 NACKStringBuilder();
44 ~NACKStringBuilder(); 44 ~NACKStringBuilder();
45 45
46 void PushNACK(uint16_t nack); 46 void PushNACK(uint16_t nack);
47 std::string GetResult(); 47 std::string GetResult();
48 48
49 private: 49 private:
(...skipping 22 matching lines...) Expand all
72 RtcpReceiveTimeInfo last_xr_rr; 72 RtcpReceiveTimeInfo last_xr_rr;
73 73
74 // Used when generating TMMBR. 74 // Used when generating TMMBR.
75 ModuleRtpRtcpImpl* module; 75 ModuleRtpRtcpImpl* module;
76 }; 76 };
77 77
78 RTCPSender(bool audio, 78 RTCPSender(bool audio,
79 Clock* clock, 79 Clock* clock,
80 ReceiveStatistics* receive_statistics, 80 ReceiveStatistics* receive_statistics,
81 RtcpPacketTypeCounterObserver* packet_type_counter_observer, 81 RtcpPacketTypeCounterObserver* packet_type_counter_observer,
82 RtcEventLog* event_log, 82 RtcEventLogProxy* event_log,
83 Transport* outgoing_transport); 83 Transport* outgoing_transport);
84 virtual ~RTCPSender(); 84 virtual ~RTCPSender();
85 85
86 RtcpMode Status() const; 86 RtcpMode Status() const;
87 void SetRTCPStatus(RtcpMode method); 87 void SetRTCPStatus(RtcpMode method);
88 88
89 bool Sending() const; 89 bool Sending() const;
90 int32_t SetSendingStatus(const FeedbackState& feedback_state, 90 int32_t SetSendingStatus(const FeedbackState& feedback_state,
91 bool enabled); // combine the functions 91 bool enabled); // combine the functions
92 92
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 195 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
196 rtc::scoped_ptr<rtcp::RtcpPacket> BuildDlrr(const RtcpContext& context) 196 rtc::scoped_ptr<rtcp::RtcpPacket> BuildDlrr(const RtcpContext& context)
197 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 197 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
198 198
199 private: 199 private:
200 const bool audio_; 200 const bool audio_;
201 Clock* const clock_; 201 Clock* const clock_;
202 Random random_ GUARDED_BY(critical_section_rtcp_sender_); 202 Random random_ GUARDED_BY(critical_section_rtcp_sender_);
203 RtcpMode method_ GUARDED_BY(critical_section_rtcp_sender_); 203 RtcpMode method_ GUARDED_BY(critical_section_rtcp_sender_);
204 204
205 RtcEventLog* const event_log_; 205 RtcEventLogProxy* const event_log_;
206 Transport* const transport_; 206 Transport* const transport_;
207 207
208 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_; 208 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_;
209 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_); 209 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_);
210 bool sending_ GUARDED_BY(critical_section_rtcp_sender_); 210 bool sending_ GUARDED_BY(critical_section_rtcp_sender_);
211 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_); 211 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_);
212 212
213 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_); 213 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_);
214 214
215 uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); 215 uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 284
285 typedef rtc::scoped_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)( 285 typedef rtc::scoped_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)(
286 const RtcpContext&); 286 const RtcpContext&);
287 std::map<RTCPPacketType, BuilderFunc> builders_; 287 std::map<RTCPPacketType, BuilderFunc> builders_;
288 288
289 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTCPSender); 289 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTCPSender);
290 }; 290 };
291 } // namespace webrtc 291 } // namespace webrtc
292 292
293 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ 293 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698