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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

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 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" 11 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
12 12
13 #include <stdlib.h> // srand 13 #include <stdlib.h> // srand
14 #include <algorithm> 14 #include <algorithm>
15 #include <utility> 15 #include <utility>
16 16
17 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/logging.h" 18 #include "webrtc/base/logging.h"
19 #include "webrtc/base/trace_event.h" 19 #include "webrtc/base/trace_event.h"
20 #include "webrtc/call.h" 20 #include "webrtc/call.h"
21 #include "webrtc/call/rtc_event_log.h" 21 #include "webrtc/call/rtc_event_log_proxy.h"
22 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" 22 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
23 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 23 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
24 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" 24 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h"
25 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" 25 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h"
26 #include "webrtc/modules/rtp_rtcp/source/time_util.h" 26 #include "webrtc/modules/rtp_rtcp/source/time_util.h"
27 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 27 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
28 #include "webrtc/system_wrappers/include/tick_util.h" 28 #include "webrtc/system_wrappers/include/tick_util.h"
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 bool audio, 108 bool audio,
109 Clock* clock, 109 Clock* clock,
110 Transport* transport, 110 Transport* transport,
111 RtpAudioFeedback* audio_feedback, 111 RtpAudioFeedback* audio_feedback,
112 RtpPacketSender* paced_sender, 112 RtpPacketSender* paced_sender,
113 TransportSequenceNumberAllocator* sequence_number_allocator, 113 TransportSequenceNumberAllocator* sequence_number_allocator,
114 TransportFeedbackObserver* transport_feedback_observer, 114 TransportFeedbackObserver* transport_feedback_observer,
115 BitrateStatisticsObserver* bitrate_callback, 115 BitrateStatisticsObserver* bitrate_callback,
116 FrameCountObserver* frame_count_observer, 116 FrameCountObserver* frame_count_observer,
117 SendSideDelayObserver* send_side_delay_observer, 117 SendSideDelayObserver* send_side_delay_observer,
118 RtcEventLog* event_log) 118 RtcEventLogProxy* event_log)
119 : clock_(clock), 119 : clock_(clock),
120 // TODO(holmer): Remove this conversion when we remove the use of 120 // TODO(holmer): Remove this conversion when we remove the use of
121 // TickTime. 121 // TickTime.
122 clock_delta_ms_(clock_->TimeInMilliseconds() - 122 clock_delta_ms_(clock_->TimeInMilliseconds() -
123 TickTime::MillisecondTimestamp()), 123 TickTime::MillisecondTimestamp()),
124 random_(clock_->TimeInMicroseconds()), 124 random_(clock_->TimeInMicroseconds()),
125 bitrates_(bitrate_callback), 125 bitrates_(bitrate_callback),
126 total_bitrate_sent_(clock, bitrates_.total_bitrate_observer()), 126 total_bitrate_sent_(clock, bitrates_.total_bitrate_observer()),
127 audio_configured_(audio), 127 audio_configured_(audio),
128 audio_(audio ? new RTPSenderAudio(clock, this, audio_feedback) : nullptr), 128 audio_(audio ? new RTPSenderAudio(clock, this, audio_feedback) : nullptr),
(...skipping 1782 matching lines...) Expand 10 before | Expand all | Expand 10 after
1911 rtc::CritScope lock(&send_critsect_); 1911 rtc::CritScope lock(&send_critsect_);
1912 1912
1913 RtpState state; 1913 RtpState state;
1914 state.sequence_number = sequence_number_rtx_; 1914 state.sequence_number = sequence_number_rtx_;
1915 state.start_timestamp = start_timestamp_; 1915 state.start_timestamp = start_timestamp_;
1916 1916
1917 return state; 1917 return state;
1918 } 1918 }
1919 1919
1920 } // namespace webrtc 1920 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698