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

Unified Diff: webrtc/media/base/rtpdataengine.cc

Issue 2290203002: Delete Timing class, timing.h, and update all users. (Closed)
Patch Set: Fix copy-paste error in rtpdataengine.cc. Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/base/rtpdataengine.h ('k') | webrtc/media/base/rtpdataengine_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/rtpdataengine.cc
diff --git a/webrtc/media/base/rtpdataengine.cc b/webrtc/media/base/rtpdataengine.cc
index 4b6647c649acc869fd2815f754dc548f3d9d8267..99aa3b14a5690fdee1394875019ee98aeae9f0e0 100644
--- a/webrtc/media/base/rtpdataengine.cc
+++ b/webrtc/media/base/rtpdataengine.cc
@@ -14,7 +14,6 @@
#include "webrtc/base/helpers.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/ratelimiter.h"
-#include "webrtc/base/timing.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/rtputils.h"
@@ -37,7 +36,6 @@ static const size_t kMaxSrtpHmacOverhead = 16;
RtpDataEngine::RtpDataEngine() {
data_codecs_.push_back(
DataCodec(kGoogleRtpDataCodecId, kGoogleRtpDataCodecName));
- SetTiming(new rtc::Timing());
}
DataMediaChannel* RtpDataEngine::CreateChannel(
@@ -45,7 +43,7 @@ DataMediaChannel* RtpDataEngine::CreateChannel(
if (data_channel_type != DCT_RTP) {
return NULL;
}
- return new RtpDataMediaChannel(timing_.get());
+ return new RtpDataMediaChannel();
}
bool FindCodecByName(const std::vector<DataCodec>& codecs,
@@ -60,18 +58,13 @@ bool FindCodecByName(const std::vector<DataCodec>& codecs,
return false;
}
-RtpDataMediaChannel::RtpDataMediaChannel(rtc::Timing* timing) {
- Construct(timing);
-}
-
RtpDataMediaChannel::RtpDataMediaChannel() {
- Construct(NULL);
+ Construct();
}
-void RtpDataMediaChannel::Construct(rtc::Timing* timing) {
+void RtpDataMediaChannel::Construct() {
sending_ = false;
receiving_ = false;
- timing_ = timing;
send_limiter_.reset(new rtc::RateLimiter(kDataMaxBandwidth / 8, 1.0));
}
@@ -313,7 +306,8 @@ bool RtpDataMediaChannel::SendData(
return false;
}
- double now = timing_->TimerNow();
+ double now =
+ rtc::TimeMicros() / static_cast<double>(rtc::kNumMicrosecsPerSec);
if (!send_limiter_->CanUse(packet_len, now)) {
LOG(LS_VERBOSE) << "Dropped data packet of len=" << packet_len
« no previous file with comments | « webrtc/media/base/rtpdataengine.h ('k') | webrtc/media/base/rtpdataengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698