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

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

Issue 136903003: cast: Wire upp logging to be sent over RTCP between receiver and sender. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge TOT Created 6 years, 11 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_receiver_unittest.cc ('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 3ab3f41ad58cad0ba51e37631aea3a2787bd3e5b..e5260255175181535a1729b515b681394e98c407 100644
--- a/media/cast/rtcp/rtcp_sender.cc
+++ b/media/cast/rtcp/rtcp_sender.cc
@@ -32,7 +32,7 @@ uint16 MergeEventTypeAndTimestampForWireFormat(
uint16 event_type = 0;
switch (event) {
- case media::cast::kAckSent:
+ case media::cast::kAudioAckSent:
event_type = 1;
break;
case media::cast::kAudioPlayoutDelay:
@@ -41,18 +41,24 @@ uint16 MergeEventTypeAndTimestampForWireFormat(
case media::cast::kAudioFrameDecoded:
event_type = 3;
break;
- case media::cast::kVideoFrameDecoded:
+ case media::cast::kAudioPacketReceived:
event_type = 4;
break;
- case media::cast::kVideoRenderDelay:
+ case media::cast::kVideoAckSent:
event_type = 5;
break;
- case media::cast::kPacketReceived:
+ case media::cast::kVideoFrameDecoded:
event_type = 6;
break;
- case media::cast::kDuplicatePacketReceived:
+ case media::cast::kVideoRenderDelay:
event_type = 7;
break;
+ case media::cast::kVideoPacketReceived:
+ event_type = 8;
+ break;
+ case media::cast::kDuplicatePacketReceived:
+ event_type = 9;
+ break;
default:
NOTREACHED();
}
@@ -630,7 +636,8 @@ void RtcpSender::BuildReceiverLog(RtcpReceiverLogMessage* receiver_log_message,
MergeEventTypeAndTimestampForWireFormat(event_message.type,
event_message.event_timestamp - event_timestamp_base);
switch (event_message.type) {
- case kAckSent:
+ case kAudioAckSent:
+ case kVideoAckSent:
case kAudioPlayoutDelay:
case kAudioFrameDecoded:
case kVideoFrameDecoded:
@@ -639,7 +646,8 @@ void RtcpSender::BuildReceiverLog(RtcpReceiverLogMessage* receiver_log_message,
event_message.delay_delta.InMilliseconds()));
big_endian_writer.WriteU16(event_type_and_timestamp_delta);
break;
- case kPacketReceived:
+ case kAudioPacketReceived:
+ case kVideoPacketReceived:
case kDuplicatePacketReceived:
big_endian_writer.WriteU16(event_message.packet_id);
big_endian_writer.WriteU16(event_type_and_timestamp_delta);
« no previous file with comments | « media/cast/rtcp/rtcp_receiver_unittest.cc ('k') | media/cast/rtcp/rtcp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698