| 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 282483b0953fda31fd14b9877924dcf75fc78e95..8dc8b0651d24a07efc2d9c9e8608b73003e55708 100644
|
| --- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
|
| +++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
|
| @@ -245,32 +245,28 @@ class RtcpBandwidthObserver {
|
|
|
| struct PacketInfo {
|
| PacketInfo(int64_t arrival_time_ms, uint16_t sequence_number)
|
| - : PacketInfo(-1, arrival_time_ms, -1, sequence_number, 0, false) {}
|
| + : PacketInfo(-1, arrival_time_ms, -1, sequence_number, 0) {}
|
|
|
| PacketInfo(int64_t arrival_time_ms,
|
| int64_t send_time_ms,
|
| uint16_t sequence_number,
|
| - size_t payload_size,
|
| - bool was_paced)
|
| + size_t payload_size)
|
| : PacketInfo(-1,
|
| arrival_time_ms,
|
| send_time_ms,
|
| sequence_number,
|
| - payload_size,
|
| - was_paced) {}
|
| + payload_size) {}
|
|
|
| PacketInfo(int64_t creation_time_ms,
|
| int64_t arrival_time_ms,
|
| int64_t send_time_ms,
|
| uint16_t sequence_number,
|
| - size_t payload_size,
|
| - bool was_paced)
|
| + size_t payload_size)
|
| : creation_time_ms(creation_time_ms),
|
| arrival_time_ms(arrival_time_ms),
|
| send_time_ms(send_time_ms),
|
| sequence_number(sequence_number),
|
| - payload_size(payload_size),
|
| - was_paced(was_paced) {}
|
| + payload_size(payload_size) {}
|
|
|
| // Time corresponding to when this object was created.
|
| int64_t creation_time_ms;
|
| @@ -285,8 +281,6 @@ struct PacketInfo {
|
| uint16_t sequence_number;
|
| // Size of the packet excluding RTP headers.
|
| size_t payload_size;
|
| - // True if the packet was paced out by the pacer.
|
| - bool was_paced;
|
| };
|
|
|
| class TransportFeedbackObserver {
|
| @@ -296,9 +290,7 @@ class TransportFeedbackObserver {
|
|
|
| // Note: Transport-wide sequence number as sequence number. Arrival time
|
| // must be set to 0.
|
| - virtual void AddPacket(uint16_t sequence_number,
|
| - size_t length,
|
| - bool was_paced) = 0;
|
| + virtual void AddPacket(uint16_t sequence_number, size_t length) = 0;
|
|
|
| virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0;
|
| };
|
|
|