| Index: media/cast/rtcp/rtcp.cc
|
| diff --git a/media/cast/rtcp/rtcp.cc b/media/cast/rtcp/rtcp.cc
|
| index d5ee6e3c54cd3a44a0e078e16def6016f94a51d2..7a1f04a1c8844ccec8ebec311554a74dcb0fdf32 100644
|
| --- a/media/cast/rtcp/rtcp.cc
|
| +++ b/media/cast/rtcp/rtcp.cc
|
| @@ -179,7 +179,7 @@ void Rtcp::IncomingRtcpPacket(const uint8* rtcp_buffer, size_t length) {
|
| }
|
|
|
| void Rtcp::SendRtcpFromRtpReceiver(const RtcpCastMessage* cast_message,
|
| - const RtcpReceiverLogMessage* receiver_log) {
|
| + RtcpReceiverLogMessage* receiver_log) {
|
| uint32 packet_type_flags = 0;
|
|
|
| base::TimeTicks now = cast_environment_->Clock()->NowTicks();
|
| @@ -239,15 +239,15 @@ void Rtcp::SendRtcpFromRtpReceiver(const RtcpCastMessage* cast_message,
|
| }
|
|
|
| void Rtcp::SendRtcpFromRtpSender(
|
| - const RtcpSenderLogMessage* sender_log_message) {
|
| + RtcpSenderLogMessage* sender_log_message) {
|
| uint32 packet_type_flags = RtcpSender::kRtcpSr;
|
| base::TimeTicks now = cast_environment_->Clock()->NowTicks();
|
|
|
| - RtcpSenderInfo sender_info;
|
| - RtcpDlrrReportBlock dlrr;
|
| -
|
| - if (sender_log_message) packet_type_flags |= RtcpSender::kRtcpSenderLog;
|
| + if (sender_log_message) {
|
| + packet_type_flags |= RtcpSender::kRtcpSenderLog;
|
| + }
|
|
|
| + RtcpSenderInfo sender_info;
|
| if (rtp_sender_statistics_) {
|
| rtp_sender_statistics_->GetStatistics(now, &sender_info);
|
| } else {
|
| @@ -255,6 +255,7 @@ void Rtcp::SendRtcpFromRtpSender(
|
| }
|
| SaveLastSentNtpTime(now, sender_info.ntp_seconds, sender_info.ntp_fraction);
|
|
|
| + RtcpDlrrReportBlock dlrr;
|
| if (!time_last_report_received_.is_null()) {
|
| packet_type_flags |= RtcpSender::kRtcpDlrr;
|
| dlrr.last_rr = last_report_received_;
|
|
|