| Index: media/cast/rtcp/rtcp.cc
|
| diff --git a/media/cast/rtcp/rtcp.cc b/media/cast/rtcp/rtcp.cc
|
| index e848f2bccbdacf4a42610ae481742c1a3b88f9ca..da87c75188286077be1086366b7abf253c6ec431 100644
|
| --- a/media/cast/rtcp/rtcp.cc
|
| +++ b/media/cast/rtcp/rtcp.cc
|
| @@ -52,7 +52,9 @@ RtcpNackMessage::~RtcpNackMessage() {}
|
| RtcpRembMessage::RtcpRembMessage() {}
|
| RtcpRembMessage::~RtcpRembMessage() {}
|
|
|
| -RtcpReceiverFrameLogMessage::RtcpReceiverFrameLogMessage() {}
|
| +RtcpReceiverFrameLogMessage::RtcpReceiverFrameLogMessage(uint32 timestamp)
|
| + : rtp_timestamp(timestamp) {}
|
| +
|
| RtcpReceiverFrameLogMessage::~RtcpReceiverFrameLogMessage() {}
|
|
|
| class LocalRtcpReceiverFeedback : public RtcpReceiverFeedback {
|
| @@ -175,7 +177,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 = clock_->NowTicks();
|
| @@ -227,16 +229,15 @@ void Rtcp::SendRtcpFromRtpReceiver(const RtcpCastMessage* cast_message,
|
| receiver_log);
|
| }
|
|
|
| -void Rtcp::SendRtcpFromRtpSender(
|
| - const RtcpSenderLogMessage* sender_log_message) {
|
| +void Rtcp::SendRtcpFromRtpSender(RtcpSenderLogMessage* sender_log_message) {
|
| uint32 packet_type_flags = RtcpSender::kRtcpSr;
|
| base::TimeTicks now = 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 {
|
| @@ -244,6 +245,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_;
|
|
|