Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1038)

Unified Diff: webrtc/test/direct_transport.cc

Issue 1487893004: Replace EventWrapper in video/, test/ and call/. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: add some back, EventTimerWrapper is in use Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/test/direct_transport.h ('k') | webrtc/test/fake_network_pipe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/direct_transport.cc
diff --git a/webrtc/test/direct_transport.cc b/webrtc/test/direct_transport.cc
index 88fee35ecc7be59d2ec8e2737e4efb3455292e4e..6f7f998cf23fd666d3e428c87b29e251a977553c 100644
--- a/webrtc/test/direct_transport.cc
+++ b/webrtc/test/direct_transport.cc
@@ -23,7 +23,7 @@ DirectTransport::DirectTransport(Call* send_call)
DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config,
Call* send_call)
: send_call_(send_call),
- packet_event_(EventWrapper::Create()),
+ packet_event_(false, false),
thread_(NetworkProcess, this, "NetworkProcess"),
clock_(Clock::GetRealTimeClock()),
shutting_down_(false),
@@ -43,7 +43,7 @@ void DirectTransport::StopSending() {
shutting_down_ = true;
}
- packet_event_->Set();
+ packet_event_.Set();
thread_.Stop();
}
@@ -60,13 +60,13 @@ bool DirectTransport::SendRtp(const uint8_t* data,
send_call_->OnSentPacket(sent_packet);
}
fake_network_.SendPacket(data, length);
- packet_event_->Set();
+ packet_event_.Set();
return true;
}
bool DirectTransport::SendRtcp(const uint8_t* data, size_t length) {
fake_network_.SendPacket(data, length);
- packet_event_->Set();
+ packet_event_.Set();
return true;
}
@@ -78,15 +78,7 @@ bool DirectTransport::SendPackets() {
fake_network_.Process();
int64_t wait_time_ms = fake_network_.TimeUntilNextProcess();
if (wait_time_ms > 0) {
- switch (packet_event_->Wait(static_cast<unsigned long>(wait_time_ms))) {
- case kEventSignaled:
- break;
- case kEventTimeout:
- break;
- case kEventError:
- // TODO(pbos): Log a warning here?
- return true;
- }
+ packet_event_.Wait(static_cast<int>(wait_time_ms));
}
rtc::CritScope crit(&lock_);
return shutting_down_ ? false : true;
« no previous file with comments | « webrtc/test/direct_transport.h ('k') | webrtc/test/fake_network_pipe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698