admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete struct RTCPReportBlock as no longer used

Browse Source 
All usage was updated to class ReportBlockData

Bug: None
Change-Id: I9f39374680bbbc821d68ba3c556ec0c3119bb844
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306980
Commit-Queue: Erik Språng <sprang@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40180}
This commit is contained in:
Danil Chapovalov 2023-05-30 10:58:00 +02:00 committed by WebRTC LUCI CQ
parent d8b88d8b94
commit d8098fb5fd
5 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/base/media_channel.h
View File

@ -385,8 +385,8 @@ struct MediaSenderInfo {
std::vector<SsrcReceiverInfo> 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<webrtc::ReportBlockData> report_block_datas;
absl::optional<bool> active;
// https://w3c.github.io/webrtc-stats/#dom-rtcoutboundrtpstreamstats-totalpacketsenddelay

6
modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
View File

@ -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;

15
modules/rtp_rtcp/include/rtp_rtcp_defines.h
View File

@ -13,7 +13,6 @@
#include <stddef.h>
#include <list>
#include <memory>
#include <vector>
@ -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<RTCPReportBlock> ReportBlockList;
struct RtpState {
uint16_t sequence_number = 0;
uint32_t start_timestamp = 0;

4
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -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<ReportBlockData> GetLatestReportBlockData() const override;
absl::optional<SenderReportStats> GetSenderReportStats() const override;
// Round trip time statistics computed from the XR block contained in the last

4
modules/rtp_rtcp/source/rtp_rtcp_impl2.h
View File

@ -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<ReportBlockData> GetLatestReportBlockData() const override;
absl::optional<SenderReportStats> GetSenderReportStats() const override;
absl::optional<NonSenderRttStats> GetNonSenderRttStats() const override;