Simplify ReportBlockStats
Bug: webrtc:10679
Change-Id: I946e805eb4edf3c3fc39b78235a5bd353db11598
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/147644
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28734}
diff --git a/video/report_block_stats.h b/video/report_block_stats.h
index bb9ea78..de4a079 100644
--- a/video/report_block_stats.h
+++ b/video/report_block_stats.h
@@ -14,44 +14,47 @@
#include <stdint.h>
#include <map>
-#include <vector>
#include "modules/rtp_rtcp/include/rtcp_statistics.h"
-#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
namespace webrtc {
+// TODO(nisse): Usefulness of this class is somewhat unclear. The inputs are
+// cumulative counters, from which we compute deltas, and then accumulate the
+// deltas. May be needed on the send side, to handle wraparound in the short
+// counters received over RTCP, but should not be needed on the receive side
+// where we can use large enough types for all counters we need.
+
// Helper class for rtcp statistics.
class ReportBlockStats {
public:
- typedef std::map<uint32_t, RTCPReportBlock> ReportBlockMap;
- typedef std::vector<RTCPReportBlock> ReportBlockVector;
ReportBlockStats();
~ReportBlockStats();
// Updates stats and stores report block.
- void Store(const RtcpStatistics& rtcp_stats,
- uint32_t remote_ssrc,
- uint32_t source_ssrc);
+ void Store(uint32_t ssrc, const RtcpStatistics& rtcp_stats);
// Returns the total fraction of lost packets (or -1 if less than two report
// blocks have been stored).
int FractionLostInPercent() const;
private:
+ // The information from an RTCP report block that we need.
+ struct Report {
+ uint32_t extended_highest_sequence_number;
+ int32_t packets_lost;
+ };
+
// Updates the total number of packets/lost packets.
- // Stores the report block.
- // Returns the number of packets/lost packets since previous report block.
- void StoreAndAddPacketIncrement(const RTCPReportBlock& report_block,
- uint32_t* num_sequence_numbers,
- uint32_t* num_lost_sequence_numbers);
+ // Stores the report.
+ void StoreAndAddPacketIncrement(uint32_t ssrc, const Report& report);
// The total number of packets/lost packets.
uint32_t num_sequence_numbers_;
uint32_t num_lost_sequence_numbers_;
- // Map holding the last stored report block (mapped by the source SSRC).
- ReportBlockMap prev_report_blocks_;
+ // Map holding the last stored report (mapped by the source SSRC).
+ std::map<uint32_t, Report> prev_reports_;
};
} // namespace webrtc