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

Fix for clock read race in FakeNetworkPipe.

Browse Source 
Bug: none
Change-Id: Id708c532bfc0c9cd696a974d455ff79f25c222fe
Reviewed-on: https://webrtc-review.googlesource.com/c/107880
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Christoffer Rodbro <crodbro@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25363}
This commit is contained in:
Christoffer Rodbro
2018-10-25 12:39:49 +02:00
committed by Commit Bot
parent 3284b61a6c
commit 1803bb2470
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
call/fake_network_pipe.cc
View File

@ -154,8 +154,8 @@ bool FakeNetworkPipe::EnqueuePacket(rtc::CopyOnWriteBuffer packet,
bool is_rtcp,
MediaType media_type,
absl::optional<int64_t> packet_time_us) {
int64_t time_now_us = clock_->TimeInMicroseconds();
rtc::CritScope crit(&process_lock_);
int64_t time_now_us = clock_->TimeInMicroseconds();
size_t packet_size = packet.size();
NetworkPacket net_packet(std::move(packet), time_now_us, time_now_us, options,
is_rtcp, media_type, packet_time_us);
@ -201,10 +201,11 @@ size_t FakeNetworkPipe::SentPackets() {
}
void FakeNetworkPipe::Process() {
int64_t time_now_us = clock_->TimeInMicroseconds();
int64_t time_now_us;
std::queue<NetworkPacket> packets_to_deliver;
{
rtc::CritScope crit(&process_lock_);
time_now_us = clock_->TimeInMicroseconds();
if (time_now_us - last_log_time_us_ > kLogIntervalMs * 1000) {
int64_t queueing_delay_us = 0;
if (!packets_in_flight_.empty())