Index: media/cast/video_receiver/video_receiver.cc |
diff --git a/media/cast/video_receiver/video_receiver.cc b/media/cast/video_receiver/video_receiver.cc |
index 1c9aa824f1f5cf751b879a31b765cebdfb8853d1..82318127c2ce757591c49fe15bcbe6e4944183f5 100644 |
--- a/media/cast/video_receiver/video_receiver.cc |
+++ b/media/cast/video_receiver/video_receiver.cc |
@@ -108,7 +108,6 @@ VideoReceiver::VideoReceiver(scoped_refptr<CastEnvironment> cast_environment, |
PacedPacketSender* const packet_sender) |
: cast_environment_(cast_environment), |
codec_(video_config.codec), |
- incoming_ssrc_(video_config.incoming_ssrc), |
target_delay_delta_( |
base::TimeDelta::FromMilliseconds(video_config.rtp_max_delay_ms)), |
frame_delay_(base::TimeDelta::FromMilliseconds( |
@@ -142,11 +141,9 @@ VideoReceiver::VideoReceiver(scoped_refptr<CastEnvironment> cast_environment, |
rtp_video_receiver_statistics_.get(), |
video_config.rtcp_mode, |
base::TimeDelta::FromMilliseconds(video_config.rtcp_interval), |
- false, |
video_config.feedback_ssrc, |
+ video_config.incoming_ssrc, |
video_config.rtcp_c_name)); |
- |
- rtcp_->SetRemoteSSRC(video_config.incoming_ssrc); |
ScheduleNextRtcpReport(); |
ScheduleNextCastMessage(); |
} |
@@ -366,7 +363,8 @@ void VideoReceiver::IncomingRtpPacket(const uint8* payload_data, |
// Send a cast feedback message. Actual message created in the framer (cast |
// message builder). |
void VideoReceiver::CastFeedback(const RtcpCastMessage& cast_message) { |
- rtcp_->SendRtcpCast(cast_message); |
+ // TODO(pwestin): wire up log messages. |
+ rtcp_->SendRtcpFromRtpReceiver(&cast_message, NULL); |
time_last_sent_cast_message_= cast_environment_->Clock()->NowTicks(); |
} |
@@ -404,7 +402,7 @@ void VideoReceiver::ScheduleNextRtcpReport() { |
} |
void VideoReceiver::SendNextRtcpReport() { |
- rtcp_->SendRtcpReport(incoming_ssrc_); |
+ rtcp_->SendRtcpFromRtpReceiver(NULL, NULL); |
ScheduleNextRtcpReport(); |
} |