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

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

Browse Source 
Reason for revert:
Breaks google3 buildbot:  http://webrtc-buildbot-master.mtv.corp.google.com:21000/builders/WebRTC%20google3%20Importer/builds/8640

Original issue's description:
> Propagate probing cluster id to SendTimeHistory, both for packets and padding.
>
> BUG=webrtc:5859
>
> Committed: https://crrev.com/5be28c848b91bc6e4800eac07a3f5ac09a32ad70
> Cr-Commit-Position: refs/heads/master@{#12985}

TBR=danilchap@webrtc.org,stefan@webrtc.org,mflodman@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5859

Review-Url: https://codereview.webrtc.org/2032463003
Cr-Commit-Position: refs/heads/master@{#12987}
This commit is contained in:
philipel
2016-06-01 04:04:40 -07:00
committed by Commit bot
parent ce8d58c20e
commit 46948c17fd
24 changed files with 192 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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