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

Unified Diff: media/cast/net/rtcp/rtcp_builder.cc

Issue 1515433002: Replace uses of raw uint32's with a type-checked RtpTimeTicks data type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Speculative workaround fix for win8_chromium_ng compile error. Created 5 years 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 | « media/cast/net/rtcp/rtcp.cc ('k') | media/cast/net/rtcp/rtcp_builder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/rtcp/rtcp_builder.cc
diff --git a/media/cast/net/rtcp/rtcp_builder.cc b/media/cast/net/rtcp/rtcp_builder.cc
index 1f81520718774cc95460373bb50201d84a1968b5..cd7652307837fa64314ba4607b7c62d34c0954e6 100644
--- a/media/cast/net/rtcp/rtcp_builder.cc
+++ b/media/cast/net/rtcp/rtcp_builder.cc
@@ -300,7 +300,7 @@ void RtcpBuilder::AddSR(const RtcpSenderInfo& sender_info) {
writer_.WriteU32(ssrc_);
writer_.WriteU32(sender_info.ntp_seconds);
writer_.WriteU32(sender_info.ntp_fraction);
- writer_.WriteU32(sender_info.rtp_timestamp);
+ writer_.WriteU32(sender_info.rtp_timestamp.lower_32_bits());
writer_.WriteU32(sender_info.send_packet_count);
writer_.WriteU32(static_cast<uint32_t>(sender_info.send_octet_count));
}
@@ -354,7 +354,7 @@ void RtcpBuilder::AddReceiverLog(
receiver_log_message.front());
// Add our frame header.
- writer_.WriteU32(frame_log_messages.rtp_timestamp_);
+ writer_.WriteU32(frame_log_messages.rtp_timestamp_.lower_32_bits());
size_t messages_in_frame = frame_log_messages.event_log_messages_.size();
if (messages_in_frame > total_number_of_messages_to_send) {
// We are running out of space.
@@ -432,7 +432,7 @@ bool RtcpBuilder::GetRtcpReceiverLogMessage(
while (rit != rtcp_events.rend() &&
remaining_space >=
kRtcpReceiverFrameLogSize + kRtcpReceiverEventLogSize) {
- const RtpTimestamp rtp_timestamp = rit->first;
+ const RtpTimeTicks rtp_timestamp = rit->first;
RtcpReceiverFrameLogMessage frame_log(rtp_timestamp);
remaining_space -= kRtcpReceiverFrameLogSize;
++number_of_frames;
« no previous file with comments | « media/cast/net/rtcp/rtcp.cc ('k') | media/cast/net/rtcp/rtcp_builder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698