zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert of Propagate probing cluster id to SendTimeHistory. (patchset #5 id:80001 of https://codereview.webrtc.org/2005313003/ )"

Browse Source 
This reverts commit 46948c17fd09e4957bebc8ea61f0a8e77ff84b48.
TBR=mflodman@webrtc.org
BUG=webrtc:5859

Review-Url: https://codereview.webrtc.org/2032473002
Cr-Commit-Position: refs/heads/master@{#12992}
This commit is contained in:
philipel
2016-06-01 06:31:17 -07:00
committed by Commit bot
parent 98bba39816
commit a1ed0b3241
24 changed files with 290 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -315,9 +315,10 @@ class RtpRtcp : public Module {
virtual bool TimeToSendPacket(uint32_t ssrc,
uint16_t sequence_number,
int64_t capture_time_ms,
bool retransmission) = 0;
bool retransmission,
int probe_cluster_id) = 0;
virtual size_t TimeToSendPadding(size_t bytes) = 0;
virtual size_t TimeToSendPadding(size_t bytes, int probe_cluster_id) = 0;
// Called on generation of new statistics after an RTP send.
virtual void RegisterSendChannelRtpStatisticsCallback(

27
webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
View File

@ -245,32 +245,44 @@ 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,
false,
kNotAProbe) {}
PacketInfo(int64_t arrival_time_ms,
int64_t send_time_ms,
uint16_t sequence_number,
size_t payload_size,
bool was_paced)
bool was_paced,
int probe_cluster_id)
: PacketInfo(-1,
arrival_time_ms,
send_time_ms,
sequence_number,
payload_size,
was_paced) {}
was_paced,
probe_cluster_id) {}
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)
bool was_paced,
int probe_cluster_id)
: 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) {}
was_paced(was_paced),
probe_cluster_id(probe_cluster_id) {}
static constexpr int kNotAProbe = -1;
// Time corresponding to when this object was created.
int64_t creation_time_ms;
@ -287,6 +299,8 @@ struct PacketInfo {
size_t payload_size;
// True if the packet was paced out by the pacer.
bool was_paced;
// Which probing cluster this packets belongs to.
int probe_cluster_id;
};
class TransportFeedbackObserver {
@ -298,7 +312,8 @@ class TransportFeedbackObserver {
// must be set to 0.
virtual void AddPacket(uint16_t sequence_number,
size_t length,
bool was_paced) = 0;
bool was_paced,
int probe_cluster_id) = 0;
virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0;
};