Index: media/cast/sender/frame_sender.cc |
diff --git a/media/cast/sender/frame_sender.cc b/media/cast/sender/frame_sender.cc |
index 1df62fbd5cc870c46c53163b16308c81b0d458c8..eb30bac9455572d9b06c64d4e2bb5a6b8601d84d 100644 |
--- a/media/cast/sender/frame_sender.cc |
+++ b/media/cast/sender/frame_sender.cc |
@@ -58,7 +58,6 @@ FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment, |
DCHECK(congestion_control_); |
SetTargetPlayoutDelay(min_playout_delay_); |
send_target_playout_delay_ = false; |
- memset(frame_rtp_timestamps_, 0, sizeof(frame_rtp_timestamps_)); |
} |
FrameSender::~FrameSender() { |
@@ -89,10 +88,10 @@ void FrameSender::SendRtcpReport(bool schedule_future_reports) { |
const base::TimeTicks now = cast_environment_->Clock()->NowTicks(); |
const base::TimeDelta time_delta = |
now - GetRecordedReferenceTime(last_sent_frame_id_); |
- const int64_t rtp_delta = TimeDeltaToRtpDelta(time_delta, rtp_timebase_); |
- const uint32_t now_as_rtp_timestamp = |
- GetRecordedRtpTimestamp(last_sent_frame_id_) + |
- static_cast<uint32_t>(rtp_delta); |
+ const RtpTimeDelta rtp_delta = |
+ RtpTimeDelta::FromTimeDelta(time_delta, rtp_timebase_); |
+ const RtpTimeTicks now_as_rtp_timestamp = |
+ GetRecordedRtpTimestamp(last_sent_frame_id_) + rtp_delta; |
transport_sender_->SendSenderReport(ssrc_, now, now_as_rtp_timestamp); |
if (schedule_future_reports) |
@@ -165,7 +164,7 @@ void FrameSender::ResendForKickstart() { |
void FrameSender::RecordLatestFrameTimestamps(uint32_t frame_id, |
base::TimeTicks reference_time, |
- RtpTimestamp rtp_timestamp) { |
+ RtpTimeTicks rtp_timestamp) { |
DCHECK(!reference_time.is_null()); |
frame_reference_times_[frame_id % arraysize(frame_reference_times_)] = |
reference_time; |
@@ -177,7 +176,7 @@ base::TimeTicks FrameSender::GetRecordedReferenceTime(uint32_t frame_id) const { |
return frame_reference_times_[frame_id % arraysize(frame_reference_times_)]; |
} |
-RtpTimestamp FrameSender::GetRecordedRtpTimestamp(uint32_t frame_id) const { |
+RtpTimeTicks FrameSender::GetRecordedRtpTimestamp(uint32_t frame_id) const { |
return frame_rtp_timestamps_[frame_id % arraysize(frame_rtp_timestamps_)]; |
} |
@@ -243,7 +242,7 @@ void FrameSender::SendEncodedFrame( |
TRACE_EVENT_INSTANT1( |
"cast_perf_test", "VideoFrameEncoded", |
TRACE_EVENT_SCOPE_THREAD, |
- "rtp_timestamp", encoded_frame->rtp_timestamp); |
+ "rtp_timestamp", encoded_frame->rtp_timestamp.lower_32_bits()); |
} |
// At the start of the session, it's important to send reports before each |
@@ -273,7 +272,7 @@ void FrameSender::SendEncodedFrame( |
TRACE_EVENT_ASYNC_BEGIN1("cast.stream", |
is_audio_ ? "Audio Transport" : "Video Transport", |
frame_id, |
- "rtp_timestamp", encoded_frame->rtp_timestamp); |
+ "rtp_timestamp", encoded_frame->rtp_timestamp.lower_32_bits()); |
transport_sender_->InsertFrame(ssrc_, *encoded_frame); |
} |