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

Unified Diff: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h

Issue 2710093004: Rename webrtc::PacketInfo to webrtc::PacketFeedback (Closed)
Patch Set: Rebased Created 3 years, 9 months 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: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index a489018d28f05a5928ce28ff8be98cc263e54a63..f11949033af34c3e3eab6b23dde0805088e026d3 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -244,33 +244,33 @@ class RtcpBandwidthObserver {
virtual ~RtcpBandwidthObserver() {}
};
-struct PacketInfo {
- PacketInfo(int64_t arrival_time_ms, uint16_t sequence_number)
- : PacketInfo(-1,
- arrival_time_ms,
- -1,
- sequence_number,
- 0,
- PacedPacketInfo()) {}
-
- PacketInfo(int64_t arrival_time_ms,
- int64_t send_time_ms,
- uint16_t sequence_number,
- size_t payload_size,
- const PacedPacketInfo& pacing_info)
- : PacketInfo(-1,
- arrival_time_ms,
- send_time_ms,
- sequence_number,
- payload_size,
- pacing_info) {}
-
- PacketInfo(int64_t creation_time_ms,
- int64_t arrival_time_ms,
- int64_t send_time_ms,
- uint16_t sequence_number,
- size_t payload_size,
- const PacedPacketInfo& pacing_info)
+struct PacketFeedback {
+ PacketFeedback(int64_t arrival_time_ms, uint16_t sequence_number)
+ : PacketFeedback(-1,
+ arrival_time_ms,
+ -1,
+ sequence_number,
+ 0,
+ PacedPacketInfo()) {}
+
+ PacketFeedback(int64_t arrival_time_ms,
+ int64_t send_time_ms,
+ uint16_t sequence_number,
+ size_t payload_size,
+ const PacedPacketInfo& pacing_info)
+ : PacketFeedback(-1,
+ arrival_time_ms,
+ send_time_ms,
+ sequence_number,
+ payload_size,
+ pacing_info) {}
+
+ PacketFeedback(int64_t creation_time_ms,
+ int64_t arrival_time_ms,
+ int64_t send_time_ms,
+ uint16_t sequence_number,
+ size_t payload_size,
+ const PacedPacketInfo& pacing_info)
: creation_time_ms(creation_time_ms),
arrival_time_ms(arrival_time_ms),
send_time_ms(send_time_ms),
@@ -283,9 +283,9 @@ struct PacketInfo {
// NOTE! The variable |creation_time_ms| is not used when testing equality.
// This is due to |creation_time_ms| only being used by SendTimeHistory
// for book-keeping, and is of no interest outside that class.
- // TODO(philipel): Remove |creation_time_ms| from PacketInfo when cleaning up
- // SendTimeHistory.
- bool operator==(const PacketInfo& rhs) const {
+ // TODO(philipel): Remove |creation_time_ms| from PacketFeedback when cleaning
+ // up SendTimeHistory.
+ bool operator==(const PacketFeedback& rhs) const {
return arrival_time_ms == rhs.arrival_time_ms &&
send_time_ms == rhs.send_time_ms &&
sequence_number == rhs.sequence_number &&
@@ -321,7 +321,7 @@ class TransportFeedbackObserver {
virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0;
- virtual std::vector<PacketInfo> GetTransportFeedbackVector() const = 0;
+ virtual std::vector<PacketFeedback> GetTransportFeedbackVector() const = 0;
};
class RtcpRttStats {
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/packet.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698