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

Extend packet_id to 64 bits in SentPacket and PacketOptions to support QUIC

Browse Source 
packet numbers.

Bug: webrtc:9103
Change-Id: Iff85a9523b2890254c295d1e88b93c2e80ff8e17
Reviewed-on: https://webrtc-review.googlesource.com/72261
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23043}
This commit is contained in:
Bjorn Mellem
2018-04-25 13:24:48 -07:00
committed by Commit Bot
parent 280a31fc30
commit 3a9c46d5ff
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtc_base/asyncpacketsocket.h
View File

@ -42,7 +42,9 @@ struct PacketOptions {
~PacketOptions();
DiffServCodePoint dscp = DSCP_NO_CHANGE;
int packet_id = -1; // 16 bits, -1 represents "not set".
// When used with RTP packets (for example, webrtc::PacketOptions), the value
// should be 16 bits. A value of -1 represents "not set".
int64_t packet_id = -1;
PacketTimeUpdateParams packet_time_params;
// PacketInfo is passed to SentPacket when signaling this packet is sent.
PacketInfo info_signaled_after_sent;

4
rtc_base/socket.cc
View File

@ -17,9 +17,9 @@ PacketInfo::PacketInfo(const PacketInfo& info) = default;
PacketInfo::~PacketInfo() = default;
SentPacket::SentPacket() = default;
SentPacket::SentPacket(int packet_id, int64_t send_time_ms)
SentPacket::SentPacket(int64_t packet_id, int64_t send_time_ms)
: packet_id(packet_id), send_time_ms(send_time_ms) {}
SentPacket::SentPacket(int packet_id,
SentPacket::SentPacket(int64_t packet_id,
int64_t send_time_ms,
const rtc::PacketInfo& info)
: packet_id(packet_id), send_time_ms(send_time_ms), info(info) {}

8
rtc_base/socket.h
View File

@ -158,10 +158,12 @@ struct PacketInfo {
struct SentPacket {
SentPacket();
SentPacket(int packet_id, int64_t send_time_ms);
SentPacket(int packet_id, int64_t send_time_ms, const rtc::PacketInfo& info);
SentPacket(int64_t packet_id, int64_t send_time_ms);
SentPacket(int64_t packet_id,
int64_t send_time_ms,
const rtc::PacketInfo& info);
int packet_id = -1;
int64_t packet_id = -1;
int64_t send_time_ms = -1;
rtc::PacketInfo info;
};