Chromium Code Reviews| Index: webrtc/modules/rtp_rtcp/source/rtp_sender.cc |
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc |
| index f7b72b875c785358d42179f333ff2173075c0e99..2e504660e587145a120175378e7467b4975a81d2 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc |
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc |
| @@ -17,6 +17,7 @@ |
| #include "webrtc/base/checks.h" |
| #include "webrtc/base/logging.h" |
| #include "webrtc/base/trace_event.h" |
| +#include "webrtc/base/timeutils.h" |
| #include "webrtc/call.h" |
| #include "webrtc/call/rtc_event_log.h" |
| #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" |
| @@ -24,7 +25,6 @@ |
| #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" |
| #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" |
| #include "webrtc/modules/rtp_rtcp/source/time_util.h" |
| -#include "webrtc/system_wrappers/include/tick_util.h" |
| namespace webrtc { |
| @@ -116,9 +116,8 @@ RTPSender::RTPSender( |
| RtcEventLog* event_log) |
| : clock_(clock), |
| // TODO(holmer): Remove this conversion when we remove the use of |
| - // TickTime. |
| - clock_delta_ms_(clock_->TimeInMilliseconds() - |
| - TickTime::MillisecondTimestamp()), |
| + // TickTime. TODO(nisse): Is that now? |
|
stefan-webrtc
2016/04/19 09:19:12
Not sure. We should remove it when the same clock
nisse-webrtc
2016/04/19 12:19:25
I expect more changes to timestamps. I'm dropping
|
| + clock_delta_ms_(clock_->TimeInMilliseconds() - rtc::Time64()), |
| random_(clock_->TimeInMicroseconds()), |
| bitrates_(bitrate_callback), |
| total_bitrate_sent_(clock, bitrates_.total_bitrate_observer()), |