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

Unified Diff: media/cast/rtcp/rtcp_sender.cc

Issue 162333002: Cast: Rtcp and RtcpSender don't take event logs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cast Created 6 years, 10 months 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/rtcp/rtcp_sender.h ('k') | media/cast/rtcp/rtcp_sender_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/rtcp/rtcp_sender.cc
diff --git a/media/cast/rtcp/rtcp_sender.cc b/media/cast/rtcp/rtcp_sender.cc
index b11e60a0a33b47a1ea62844fea4e661ba27d70bd..6d0ff99fcd7da1e2ebbc2f728ce9ba6459ac22f8 100644
--- a/media/cast/rtcp/rtcp_sender.cc
+++ b/media/cast/rtcp/rtcp_sender.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "media/cast/cast_environment.h"
+#include "media/cast/rtcp/receiver_rtcp_event_subscriber.h"
#include "media/cast/rtcp/rtcp_defines.h"
#include "media/cast/rtcp/rtcp_utility.h"
#include "media/cast/transport/cast_transport_defines.h"
@@ -149,9 +150,11 @@ bool RtcpSender::IsReceiverEvent(const media::cast::CastLoggingEvent& event) {
}
void RtcpSender::SendRtcpFromRtpReceiver(
- uint32 packet_type_flags, const transport::RtcpReportBlock* report_block,
+ uint32 packet_type_flags,
+ const transport::RtcpReportBlock* report_block,
const RtcpReceiverReferenceTimeReport* rrtr,
- const RtcpCastMessage* cast_message, RtcpReceiverLogMessage* receiver_log) {
+ const RtcpCastMessage* cast_message,
+ ReceiverRtcpEventSubscriber* event_subscriber) {
if (packet_type_flags & kRtcpSr || packet_type_flags & kRtcpDlrr ||
packet_type_flags & kRtcpSenderLog) {
NOTREACHED() << "Invalid argument";
@@ -182,8 +185,10 @@ void RtcpSender::SendRtcpFromRtpReceiver(
BuildCast(cast_message, &packet);
}
if (packet_type_flags & kRtcpReceiverLog) {
- DCHECK(receiver_log) << "Invalid argument";
- BuildReceiverLog(receiver_log, &packet);
+ DCHECK(event_subscriber) << "Invalid argument";
+ RtcpReceiverLogMessage receiver_log;
+ event_subscriber->GetReceiverLogMessageAndReset(&receiver_log);
+ BuildReceiverLog(&receiver_log, &packet);
}
if (packet.empty()) return; // Sanity don't send empty packets.
« no previous file with comments | « media/cast/rtcp/rtcp_sender.h ('k') | media/cast/rtcp/rtcp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698