Index: media/cast/rtcp/rtcp_defines.h |
diff --git a/media/cast/rtcp/rtcp_defines.h b/media/cast/rtcp/rtcp_defines.h |
index d2e7c90d4352007fe39cd934813c7975220067d5..0a0fa665ae399a6630b76636612ac68a30e6647f 100644 |
--- a/media/cast/rtcp/rtcp_defines.h |
+++ b/media/cast/rtcp/rtcp_defines.h |
@@ -11,10 +11,12 @@ |
#include "media/cast/cast_config.h" |
#include "media/cast/cast_defines.h" |
+#include "media/cast/logging/logging_defines.h" |
namespace media { |
namespace cast { |
+// Handle the per frame ACK and NACK messages. |
class RtcpCastMessage { |
public: |
explicit RtcpCastMessage(uint32 media_ssrc); |
@@ -25,6 +27,43 @@ class RtcpCastMessage { |
MissingFramesAndPacketsMap missing_frames_and_packets_; |
}; |
+// Log messages form sender to receiver. |
+enum RtcpSenderFrameStatus { |
+ kRtcpSenderFrameStatusUnknown = 0, |
+ kRtcpSenderFrameStatusDroppedByEncoder = 1, |
+ kRtcpSenderFrameStatusDroppedByFlowControl = 2, |
+ kRtcpSenderFrameStatusSentToNetwork = 3, |
+}; |
+ |
+struct RtcpSenderFrameLogMessage { |
+ RtcpSenderFrameStatus frame_status_; |
Alpha Left Google
2013/11/13 23:58:40
If this is a struct then just |frame_status| and |
pwestin
2013/11/15 00:20:32
Done.
|
+ uint32 rtp_timestamp_; |
+}; |
+ |
+class RtcpSenderLogMessage { |
Alpha Left Google
2013/11/13 23:58:40
This class is not really necessary. Just use a typ
pwestin
2013/11/15 00:20:32
Done.
|
+ public: |
+ std::list<RtcpSenderFrameLogMessage> frame_log_messages_; |
+}; |
+ |
+// Log messages from receiver to sender. |
+struct RtcpReceiverEventLogMessage { |
+ CastLoggingEvent type_; |
Alpha Left Google
2013/11/13 23:58:40
This should be |type| |event_timestamp| |delay_del
pwestin
2013/11/15 00:20:32
Done.
|
+ base::TimeTicks event_timestamp_; |
+ base::TimeDelta delay_delta_; |
+ uint16 packet_id_; |
+}; |
+ |
+class RtcpReceiverFrameLogMessage { |
+ public: |
+ uint32 rtp_timestamp_; |
Alpha Left Google
2013/11/13 23:58:40
|rtp_timestamp| and |event_log_messages|
pwestin
2013/11/15 00:20:32
Done.
|
+ std::list<RtcpReceiverEventLogMessage> event_log_messages_; |
+}; |
+ |
+class RtcpReceiverLogMessage { |
Alpha Left Google
2013/11/13 23:58:40
This is not necessary. Just do a typedef.
pwestin
2013/11/15 00:20:32
Done.
|
+ public: |
+ std::list<RtcpReceiverFrameLogMessage> frame_log_messages_; |
+}; |
+ |
struct RtcpSenderInfo { |
// First three members are used for lipsync. |
// First two members are used for rtt. |