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

Unified Diff: media/cast/rtcp/rtcp_defines.h

Issue 102413014: Cast:Splitting rtcp sender (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
Index: media/cast/rtcp/rtcp_defines.h
diff --git a/media/cast/rtcp/rtcp_defines.h b/media/cast/rtcp/rtcp_defines.h
index 0277bd1feafbea0b8e3d3e61a2886c4c82f7d2a7..63a0f6aaa9dbc5154f7b3ebda1cca03f9e490f48 100644
--- a/media/cast/rtcp/rtcp_defines.h
+++ b/media/cast/rtcp/rtcp_defines.h
@@ -12,6 +12,7 @@
#include "media/cast/cast_config.h"
#include "media/cast/cast_defines.h"
#include "media/cast/logging/logging_defines.h"
+#include "media/cast/net/cast_net_defines.h"
namespace media {
namespace cast {
@@ -27,21 +28,6 @@ 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;
- uint32 rtp_timestamp;
-};
-
-typedef std::list<RtcpSenderFrameLogMessage> RtcpSenderLogMessage;
-
// Log messages from receiver to sender.
struct RtcpReceiverEventLogMessage {
CastLoggingEvent type;
@@ -63,27 +49,6 @@ class RtcpReceiverFrameLogMessage {
typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage;
-struct RtcpSenderInfo {
- // First three members are used for lipsync.
- // First two members are used for rtt.
- uint32 ntp_seconds;
- uint32 ntp_fraction;
- uint32 rtp_timestamp;
- uint32 send_packet_count;
- size_t send_octet_count;
-};
-
-struct RtcpReportBlock {
- uint32 remote_ssrc; // SSRC of sender of this report.
- uint32 media_ssrc; // SSRC of the RTP packet sender.
- uint8 fraction_lost;
- uint32 cumulative_lost; // 24 bits valid.
- uint32 extended_high_sequence_number;
- uint32 jitter;
- uint32 last_sr;
- uint32 delay_since_last_sr;
-};
-
struct RtcpRpsiMessage {
uint32 remote_ssrc;
uint8 payload_type;
@@ -114,22 +79,6 @@ struct RtcpReceiverReferenceTimeReport {
uint32 ntp_fraction;
};
-struct RtcpDlrrReportBlock {
- uint32 last_rr;
- uint32 delay_since_last_rr;
-};
-
-inline bool operator==(RtcpReportBlock lhs, RtcpReportBlock rhs) {
- return lhs.remote_ssrc == rhs.remote_ssrc &&
- lhs.media_ssrc == rhs.media_ssrc &&
- lhs.fraction_lost == rhs.fraction_lost &&
- lhs.cumulative_lost == rhs.cumulative_lost &&
- lhs.extended_high_sequence_number == rhs.extended_high_sequence_number &&
- lhs.jitter == rhs.jitter &&
- lhs.last_sr == rhs.last_sr &&
- lhs.delay_since_last_sr == rhs.delay_since_last_sr;
-}
-
inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) {
return lhs.ntp_seconds == rhs.ntp_seconds &&
lhs.ntp_fraction == rhs.ntp_fraction &&

Powered by Google App Engine
This is Rietveld 408576698