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 11bc9433a45709dd73255d0d0f3c64766488a613..0cdc8726216db2d6a31619bf4cb781dfbe8a0a30 100644 |
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h |
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h |
@@ -255,18 +255,24 @@ struct PacketFeedback { |
0, |
0, |
0, |
+ 0, |
+ 0, |
PacedPacketInfo()) {} |
PacketFeedback(int64_t arrival_time_ms, |
int64_t send_time_ms, |
uint16_t sequence_number, |
size_t payload_size, |
+ size_t rtp_headers_size, |
+ size_t transport_headers_size, |
const PacedPacketInfo& pacing_info) |
: PacketFeedback(-1, |
arrival_time_ms, |
send_time_ms, |
sequence_number, |
payload_size, |
+ rtp_headers_size, |
+ transport_headers_size, |
0, |
0, |
pacing_info) {} |
@@ -274,6 +280,8 @@ struct PacketFeedback { |
PacketFeedback(int64_t creation_time_ms, |
uint16_t sequence_number, |
size_t payload_size, |
+ size_t rtp_headers_size, |
+ size_t transport_headers_size, |
uint16_t local_net_id, |
uint16_t remote_net_id, |
const PacedPacketInfo& pacing_info) |
@@ -282,6 +290,8 @@ struct PacketFeedback { |
-1, |
sequence_number, |
payload_size, |
+ rtp_headers_size, |
+ transport_headers_size, |
local_net_id, |
remote_net_id, |
pacing_info) {} |
@@ -291,6 +301,8 @@ struct PacketFeedback { |
int64_t send_time_ms, |
uint16_t sequence_number, |
size_t payload_size, |
+ size_t rtp_headers_size, |
+ size_t transport_headers_size, |
uint16_t local_net_id, |
uint16_t remote_net_id, |
const PacedPacketInfo& pacing_info) |
@@ -299,6 +311,8 @@ struct PacketFeedback { |
send_time_ms(send_time_ms), |
sequence_number(sequence_number), |
payload_size(payload_size), |
+ rtp_headers_size(rtp_headers_size), |
+ transport_headers_size(transport_headers_size), |
local_net_id(local_net_id), |
remote_net_id(remote_net_id), |
pacing_info(pacing_info) {} |
@@ -315,7 +329,10 @@ struct PacketFeedback { |
return arrival_time_ms == rhs.arrival_time_ms && |
send_time_ms == rhs.send_time_ms && |
sequence_number == rhs.sequence_number && |
- payload_size == rhs.payload_size && pacing_info == rhs.pacing_info; |
+ payload_size == rhs.payload_size && |
+ rtp_headers_size == rhs.rtp_headers_size && |
+ transport_headers_size == rhs.transport_headers_size && |
+ pacing_info == rhs.pacing_info; |
} |
// Time corresponding to when this object was created. |
@@ -332,6 +349,10 @@ struct PacketFeedback { |
uint16_t sequence_number; |
// Size of the packet excluding RTP headers. |
size_t payload_size; |
+ // Size of the RTP headers. |
+ size_t rtp_headers_size; |
+ // Size of transport headers. |
+ size_t transport_headers_size; |
// The network route ids that this packet is associated with. |
uint16_t local_net_id; |
uint16_t remote_net_id; |
@@ -347,7 +368,8 @@ class TransportFeedbackObserver { |
// Note: Transport-wide sequence number as sequence number. |
virtual void AddPacket(uint32_t ssrc, |
uint16_t sequence_number, |
- size_t length, |
+ size_t payload_size, |
+ size_t rtp_header_size, |
const PacedPacketInfo& pacing_info) = 0; |
virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0; |