Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(975)

Unified Diff: media/cast/video_receiver/video_receiver.cc

Issue 70713002: Cast: Restructure RTCP interface to better fit our usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing line lost in merge Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/video_receiver/video_receiver.h ('k') | media/cast/video_sender/video_sender.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 40bf2b42896e0e781c4d5b7402693b2e3daaec6f..45989fe2933ae9255a683923401ba1113f9f9a41 100644
--- a/media/cast/video_receiver/video_receiver.cc
+++ b/media/cast/video_receiver/video_receiver.cc
@@ -85,7 +85,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(
@@ -120,11 +119,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);
}
VideoReceiver::~VideoReceiver() {}
@@ -363,7 +360,8 @@ void VideoReceiver::IncomingParsedRtpPacket(const uint8* payload_data,
// message builder).
void VideoReceiver::CastFeedback(const RtcpCastMessage& cast_message) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
- rtcp_->SendRtcpCast(cast_message);
+ // TODO(pwestin): wire up log messages.
+ rtcp_->SendRtcpFromRtpReceiver(&cast_message, NULL);
time_last_sent_cast_message_= cast_environment_->Clock()->NowTicks();
}
@@ -405,7 +403,7 @@ void VideoReceiver::ScheduleNextRtcpReport() {
void VideoReceiver::SendNextRtcpReport() {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
- rtcp_->SendRtcpReport(incoming_ssrc_);
+ rtcp_->SendRtcpFromRtpReceiver(NULL, NULL);
ScheduleNextRtcpReport();
}
« no previous file with comments | « media/cast/video_receiver/video_receiver.h ('k') | media/cast/video_sender/video_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698