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

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

Issue 1835053002: Change default timestamp to 64 bits in all webrtc directories. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Add TODO for timestamp. Created 4 years, 7 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/rtpdump.h ('k') | webrtc/media/engine/webrtcvideocapturer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/rtpdump.cc
diff --git a/webrtc/media/base/rtpdump.cc b/webrtc/media/base/rtpdump.cc
index a109f2d8e269bcfd135794a0c7847d2b8e51d79a..246085913e1edd2b54e51558ad16964a1d4c518a 100644
--- a/webrtc/media/base/rtpdump.cc
+++ b/webrtc/media/base/rtpdump.cc
@@ -28,13 +28,12 @@ namespace cricket {
const char RtpDumpFileHeader::kFirstLine[] = "#!rtpplay1.0 0.0.0.0/0\n";
-RtpDumpFileHeader::RtpDumpFileHeader(uint32_t start_ms, uint32_t s, uint16_t p)
- : start_sec(start_ms / 1000),
- start_usec(start_ms % 1000 * 1000),
+RtpDumpFileHeader::RtpDumpFileHeader(int64_t start_ms, uint32_t s, uint16_t p)
+ : start_sec(static_cast<uint32_t>(start_ms / 1000)),
+ start_usec(static_cast<uint32_t>(start_ms % 1000 * 1000)),
source(s),
port(p),
- padding(0) {
-}
+ padding(0) {}
void RtpDumpFileHeader::WriteToByteBuffer(rtc::ByteBufferWriter* buf) {
buf->WriteUInt32(start_sec);
@@ -44,7 +43,7 @@ void RtpDumpFileHeader::WriteToByteBuffer(rtc::ByteBufferWriter* buf) {
buf->WriteUInt16(padding);
}
-static const uint32_t kDefaultTimeIncrease = 30;
+static const int kDefaultTimeIncrease = 30;
bool RtpDumpPacket::IsValidRtpPacket() const {
return original_data_len >= data.size() &&
@@ -162,7 +161,7 @@ rtc::StreamResult RtpDumpReader::ReadFileHeader() {
uint32_t start_usec;
buf.ReadUInt32(&start_sec);
buf.ReadUInt32(&start_usec);
- start_time_ms_ = start_sec * 1000 + start_usec / 1000;
+ start_time_ms_ = static_cast<int64_t>(start_sec * 1000 + start_usec / 1000);
// Increase the length by 1 since first_line does not contain the ending \n.
first_line_and_file_header_len_ = first_line.size() + 1 + sizeof(header);
}
@@ -305,9 +304,8 @@ RtpDumpWriter::RtpDumpWriter(rtc::StreamInterface* stream)
: stream_(stream),
packet_filter_(PF_ALL),
file_header_written_(false),
- start_time_ms_(rtc::Time()),
- warn_slow_writes_delay_(kWarnSlowWritesDelayMs) {
-}
+ start_time_ms_(rtc::TimeMillis()),
+ warn_slow_writes_delay_(kWarnSlowWritesDelayMs) {}
void RtpDumpWriter::set_packet_filter(int filter) {
packet_filter_ = filter;
@@ -315,7 +313,7 @@ void RtpDumpWriter::set_packet_filter(int filter) {
}
uint32_t RtpDumpWriter::GetElapsedTime() const {
- return rtc::TimeSince(start_time_ms_);
+ return static_cast<uint32_t>(rtc::TimeSince(start_time_ms_));
}
rtc::StreamResult RtpDumpWriter::WriteFileHeader() {
@@ -327,7 +325,7 @@ rtc::StreamResult RtpDumpWriter::WriteFileHeader() {
}
rtc::ByteBufferWriter buf;
- RtpDumpFileHeader file_header(rtc::Time(), 0, 0);
+ RtpDumpFileHeader file_header(rtc::TimeMillis(), 0, 0);
file_header.WriteToByteBuffer(&buf);
return WriteToStream(buf.Data(), buf.Length());
}
@@ -395,10 +393,10 @@ size_t RtpDumpWriter::FilterPacket(const void* data, size_t data_len,
rtc::StreamResult RtpDumpWriter::WriteToStream(
const void* data, size_t data_len) {
- uint32_t before = rtc::Time();
+ int64_t before = rtc::TimeMillis();
rtc::StreamResult result =
stream_->WriteAll(data, data_len, NULL, NULL);
- uint32_t delay = rtc::TimeSince(before);
+ int64_t delay = rtc::TimeSince(before);
if (delay >= warn_slow_writes_delay_) {
LOG(LS_WARNING) << "Slow RtpDump: took " << delay << "ms to write "
<< data_len << " bytes.";
« no previous file with comments | « webrtc/media/base/rtpdump.h ('k') | webrtc/media/engine/webrtcvideocapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698