diff --git a/media/base/media_channel.h b/media/base/media_channel.h index de7024e1b9..9749cd0568 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -385,8 +385,8 @@ struct MediaSenderInfo { std::vector remote_stats; // A snapshot of the most recent Report Block with additional data of interest // to statistics. Used to implement RTCRemoteInboundRtpStreamStats. Within - // this list, the ReportBlockData::RTCPReportBlock::source_ssrc(), which is - // the SSRC of the corresponding outbound RTP stream, is unique. + // this list, the `ReportBlockData::source_ssrc()`, which is the SSRC of the + // corresponding outbound RTP stream, is unique. std::vector report_block_datas; absl::optional active; // https://w3c.github.io/webrtc-stats/#dom-rtcoutboundrtpstreamstats-totalpacketsenddelay diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc index 14a2b13831..5aad74c46e 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc +++ b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc @@ -98,12 +98,6 @@ class TransportFeedbackAdapterTest : public ::testing::Test { virtual void TearDown() { adapter_.reset(); } protected: - void OnReceivedEstimatedBitrate(uint32_t bitrate) {} - - void OnReceivedRtcpReceiverReport(const ReportBlockList& report_blocks, - int64_t rtt, - int64_t now_ms) {} - void OnSentPacket(const PacketResult& packet_feedback) { RtpPacketSendInfo packet_info; packet_info.media_ssrc = kSsrc; diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index ce39006ce8..26126e3567 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -13,7 +13,6 @@ #include -#include #include #include @@ -125,20 +124,6 @@ enum RtxMode { const size_t kRtxHeaderSize = 2; -struct RTCPReportBlock { - // Fields as described by RFC 3550 6.4.2. - uint32_t sender_ssrc = 0; // SSRC of sender of this report. - uint32_t source_ssrc = 0; // SSRC of the RTP packet sender. - uint8_t fraction_lost = 0; - int32_t packets_lost = 0; // 24 bits valid. - uint32_t extended_highest_sequence_number = 0; - uint32_t jitter = 0; - uint32_t last_sender_report_timestamp = 0; - uint32_t delay_since_last_sender_report = 0; -}; - -typedef std::list ReportBlockList; - struct RtpState { uint16_t sequence_number = 0; uint32_t start_timestamp = 0; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 178c6b00ae..50937f574d 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -184,8 +184,8 @@ class ABSL_DEPRECATED("") ModuleRtpRtcpImpl // A snapshot of the most recent Report Block with additional data of // interest to statistics. Used to implement RTCRemoteInboundRtpStreamStats. - // Within this list, the ReportBlockData::RTCPReportBlock::source_ssrc(), - // which is the SSRC of the corresponding outbound RTP stream, is unique. + // Within this list, the `ReportBlockData::source_ssrc()`, which is the SSRC + // of the corresponding outbound RTP stream, is unique. std::vector GetLatestReportBlockData() const override; absl::optional GetSenderReportStats() const override; // Round trip time statistics computed from the XR block contained in the last diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h index d6ffd8a9df..1e11713ece 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h @@ -196,8 +196,8 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface, // A snapshot of the most recent Report Block with additional data of // interest to statistics. Used to implement RTCRemoteInboundRtpStreamStats. - // Within this list, the ReportBlockData::RTCPReportBlock::source_ssrc(), - // which is the SSRC of the corresponding outbound RTP stream, is unique. + // Within this list, the `ReportBlockData::source_ssrc()`, which is the SSRC + // of the corresponding outbound RTP stream, is unique. std::vector GetLatestReportBlockData() const override; absl::optional GetSenderReportStats() const override; absl::optional GetNonSenderRttStats() const override;