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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
13 13
14 #include <list> 14 #include <list>
15 #include <map> 15 #include <map>
16 #include <utility> 16 #include <utility>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/random.h" 20 #include "webrtc/base/random.h"
21 #include "webrtc/base/thread_annotations.h" 21 #include "webrtc/base/thread_annotations.h"
22 #include "webrtc/call/rtc_event_log_proxy.h"
22 #include "webrtc/common_types.h" 23 #include "webrtc/common_types.h"
23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 24 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
24 #include "webrtc/modules/rtp_rtcp/source/bitrate.h" 25 #include "webrtc/modules/rtp_rtcp/source/bitrate.h"
25 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" 26 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h"
27 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" 28 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
28 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 29 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
29 #include "webrtc/modules/rtp_rtcp/source/ssrc_database.h" 30 #include "webrtc/modules/rtp_rtcp/source/ssrc_database.h"
30 #include "webrtc/transport.h" 31 #include "webrtc/transport.h"
31 32
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 RTPSender(bool audio, 91 RTPSender(bool audio,
91 Clock* clock, 92 Clock* clock,
92 Transport* transport, 93 Transport* transport,
93 RtpAudioFeedback* audio_feedback, 94 RtpAudioFeedback* audio_feedback,
94 RtpPacketSender* paced_sender, 95 RtpPacketSender* paced_sender,
95 TransportSequenceNumberAllocator* sequence_number_allocator, 96 TransportSequenceNumberAllocator* sequence_number_allocator,
96 TransportFeedbackObserver* transport_feedback_callback, 97 TransportFeedbackObserver* transport_feedback_callback,
97 BitrateStatisticsObserver* bitrate_callback, 98 BitrateStatisticsObserver* bitrate_callback,
98 FrameCountObserver* frame_count_observer, 99 FrameCountObserver* frame_count_observer,
99 SendSideDelayObserver* send_side_delay_observer, 100 SendSideDelayObserver* send_side_delay_observer,
100 RtcEventLog* event_log); 101 RtcEventLogProxy* event_log);
101 virtual ~RTPSender(); 102 virtual ~RTPSender();
102 103
103 void ProcessBitrate(); 104 void ProcessBitrate();
104 105
105 uint16_t ActualSendBitrateKbit() const override; 106 uint16_t ActualSendBitrateKbit() const override;
106 107
107 uint32_t VideoBitrateSent() const; 108 uint32_t VideoBitrateSent() const;
108 uint32_t FecOverheadRate() const; 109 uint32_t FecOverheadRate() const;
109 uint32_t NackOverheadRate() const; 110 uint32_t NackOverheadRate() const;
110 111
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 459
459 // Statistics 460 // Statistics
460 rtc::scoped_ptr<CriticalSectionWrapper> statistics_crit_; 461 rtc::scoped_ptr<CriticalSectionWrapper> statistics_crit_;
461 SendDelayMap send_delays_ GUARDED_BY(statistics_crit_); 462 SendDelayMap send_delays_ GUARDED_BY(statistics_crit_);
462 FrameCounts frame_counts_ GUARDED_BY(statistics_crit_); 463 FrameCounts frame_counts_ GUARDED_BY(statistics_crit_);
463 StreamDataCounters rtp_stats_ GUARDED_BY(statistics_crit_); 464 StreamDataCounters rtp_stats_ GUARDED_BY(statistics_crit_);
464 StreamDataCounters rtx_rtp_stats_ GUARDED_BY(statistics_crit_); 465 StreamDataCounters rtx_rtp_stats_ GUARDED_BY(statistics_crit_);
465 StreamDataCountersCallback* rtp_stats_callback_ GUARDED_BY(statistics_crit_); 466 StreamDataCountersCallback* rtp_stats_callback_ GUARDED_BY(statistics_crit_);
466 FrameCountObserver* const frame_count_observer_; 467 FrameCountObserver* const frame_count_observer_;
467 SendSideDelayObserver* const send_side_delay_observer_; 468 SendSideDelayObserver* const send_side_delay_observer_;
468 RtcEventLog* const event_log_; 469 RtcEventLogProxy* const event_log_;
469 470
470 // RTP variables 471 // RTP variables
471 bool start_timestamp_forced_ GUARDED_BY(send_critsect_); 472 bool start_timestamp_forced_ GUARDED_BY(send_critsect_);
472 uint32_t start_timestamp_ GUARDED_BY(send_critsect_); 473 uint32_t start_timestamp_ GUARDED_BY(send_critsect_);
473 SSRCDatabase* const ssrc_db_; 474 SSRCDatabase* const ssrc_db_;
474 uint32_t remote_ssrc_ GUARDED_BY(send_critsect_); 475 uint32_t remote_ssrc_ GUARDED_BY(send_critsect_);
475 bool sequence_number_forced_ GUARDED_BY(send_critsect_); 476 bool sequence_number_forced_ GUARDED_BY(send_critsect_);
476 uint16_t sequence_number_ GUARDED_BY(send_critsect_); 477 uint16_t sequence_number_ GUARDED_BY(send_critsect_);
477 uint16_t sequence_number_rtx_ GUARDED_BY(send_critsect_); 478 uint16_t sequence_number_rtx_ GUARDED_BY(send_critsect_);
478 bool ssrc_forced_ GUARDED_BY(send_critsect_); 479 bool ssrc_forced_ GUARDED_BY(send_critsect_);
(...skipping 15 matching lines...) Expand all
494 // that the target bitrate is still valid. 495 // that the target bitrate is still valid.
495 rtc::scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_; 496 rtc::scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_;
496 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); 497 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_);
497 498
498 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender); 499 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
499 }; 500 };
500 501
501 } // namespace webrtc 502 } // namespace webrtc
502 503
503 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 504 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698