Change default timestamp to 64 bits in all webrtc directories.

webrtc/media/base/rtpdump.cc

 /*
  *  Copyright (c) 2010 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 
 namespace {
 static const int kRtpSsrcOffset = 8;
 const int  kWarnSlowWritesDelayMs = 50;
 }  // namespace
 
 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);
   buf->WriteUInt32(start_usec);
   buf->WriteUInt32(source);
   buf->WriteUInt16(port);
   buf->WriteUInt16(padding);
 }
 
-static const uint32_t kDefaultTimeIncrease = 30;
+static const int kDefaultTimeIncrease = 30;
 
 bool RtpDumpPacket::IsValidRtpPacket() const {
   return original_data_len >= data.size() &&
       data.size() >= kMinRtpPacketLen;
 }
 
 bool RtpDumpPacket::IsValidRtcpPacket() const {
   return original_data_len == 0 &&
       data.size() >= kMinRtcpPacketLen;
 }
@@ skipping 97 matching lines @@
 
   // Read the 16 byte file header.
   char header[RtpDumpFileHeader::kHeaderLength];
   res = stream_->ReadAll(header, sizeof(header), NULL, NULL);
   if (res == rtc::SR_SUCCESS) {
     rtc::ByteBufferReader buf(header, sizeof(header));
     uint32_t start_sec;
     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);
   }
   return res;
 }
 
 bool RtpDumpReader::CheckFirstLine(const std::string& first_line) {
   // The first line is like "#!rtpplay1.0 address/port"
   bool matched = (0 == first_line.find("#!rtpplay1.0 "));
 
@@ skipping 122 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////
 // Implementation of RtpDumpWriter.
 ///////////////////////////////////////////////////////////////////////////
 
 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;
   LOG(LS_INFO) << "RtpDumpWriter set_packet_filter to " << packet_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() {
   rtc::StreamResult res = WriteToStream(
       RtpDumpFileHeader::kFirstLine,
       strlen(RtpDumpFileHeader::kFirstLine));
   if (res != rtc::SR_SUCCESS) {
     return res;
   }
 
   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());
 }
 
 rtc::StreamResult RtpDumpWriter::WritePacket(const void* data,
                                              size_t data_len,
                                              uint32_t elapsed,
                                              bool rtcp) {
   if (!stream_ || !data || 0 == data_len) return rtc::SR_ERROR;
 
@@ skipping 47 matching lines @@
       // RTCP header + payload
       filtered_len = data_len;
     }
   }
 
   return filtered_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.";
   }
   return result;
 }
 
 }  // namespace cricket