| Index: media/cast/video_sender/video_sender.cc
|
| diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
|
| index 7d8f7c13c28bfb2cddf147654d1e32c846fdd9b2..16f5493c5f1bf95c6194b5ad5972cfd12c2bda1e 100644
|
| --- a/media/cast/video_sender/video_sender.cc
|
| +++ b/media/cast/video_sender/video_sender.cc
|
| @@ -59,7 +59,7 @@ VideoSender::VideoSender(
|
| max_frame_rate_(video_config.max_frame_rate),
|
| cast_environment_(cast_environment),
|
| rtcp_feedback_(new LocalRtcpVideoSenderFeedback(this)),
|
| - rtp_sender_(new RtpSender(cast_environment->Clock(), NULL, &video_config,
|
| + rtp_sender_(new RtpSender(cast_environment, NULL, &video_config,
|
| paced_packet_sender)),
|
| last_acked_frame_id_(-1),
|
| last_sent_frame_id_(-1),
|
| @@ -89,7 +89,7 @@ VideoSender::VideoSender(
|
| video_encoder_controller_ = video_encoder_.get();
|
| }
|
| rtcp_.reset(new Rtcp(
|
| - cast_environment_->Clock(),
|
| + cast_environment_,
|
| rtcp_feedback_.get(),
|
| paced_packet_sender,
|
| rtp_video_sender_statistics_.get(),
|
| @@ -249,6 +249,8 @@ void VideoSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) {
|
| base::TimeDelta max_rtt;
|
|
|
| if (rtcp_->Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt)) {
|
| + cast_environment_->Logging()->InsertGenericEvent(kRttMs,
|
| + rtt.InMilliseconds());
|
| // Don't use a RTT lower than our average.
|
| rtt = std::max(rtt, avg_rtt);
|
| } else {
|
| @@ -301,6 +303,8 @@ void VideoSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) {
|
| }
|
|
|
| void VideoSender::ReceivedAck(uint8 acked_frame_id) {
|
| + cast_environment_->Logging()->InsertGenericEvent(kAckReceived,
|
| + acked_frame_id);
|
| VLOG(1) << "ReceivedAck:" << static_cast<int>(acked_frame_id);
|
| last_acked_frame_id_ = acked_frame_id;
|
| UpdateFramesInFlight();
|
|
|