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

Side by Side Diff: webrtc/test/direct_transport.cc

Issue 1476453002: Clean up PlatformThread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: IsRunning DCHECK 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 unified diff | Download patch
« no previous file with comments | « webrtc/test/direct_transport.h ('k') | webrtc/test/fake_audio_device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include "webrtc/test/direct_transport.h" 10 #include "webrtc/test/direct_transport.h"
11 11
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 #include "webrtc/call.h" 14 #include "webrtc/call.h"
15 #include "webrtc/system_wrappers/include/clock.h" 15 #include "webrtc/system_wrappers/include/clock.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 namespace test { 18 namespace test {
19 19
20 DirectTransport::DirectTransport(Call* send_call) 20 DirectTransport::DirectTransport(Call* send_call)
21 : send_call_(send_call), 21 : DirectTransport(FakeNetworkPipe::Config(), send_call) {}
22 packet_event_(EventWrapper::Create()),
23 thread_(
24 PlatformThread::CreateThread(NetworkProcess, this, "NetworkProcess")),
25 clock_(Clock::GetRealTimeClock()),
26 shutting_down_(false),
27 fake_network_(FakeNetworkPipe::Config()) {
28 EXPECT_TRUE(thread_->Start());
29 }
30 22
31 DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config, 23 DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config,
32 Call* send_call) 24 Call* send_call)
33 : send_call_(send_call), 25 : send_call_(send_call),
34 packet_event_(EventWrapper::Create()), 26 packet_event_(EventWrapper::Create()),
35 thread_( 27 thread_(NetworkProcess, this, "NetworkProcess"),
36 PlatformThread::CreateThread(NetworkProcess, this, "NetworkProcess")),
37 clock_(Clock::GetRealTimeClock()), 28 clock_(Clock::GetRealTimeClock()),
38 shutting_down_(false), 29 shutting_down_(false),
39 fake_network_(config) { 30 fake_network_(config) {
40 EXPECT_TRUE(thread_->Start()); 31 thread_.Start();
41 } 32 }
42 33
43 DirectTransport::~DirectTransport() { StopSending(); } 34 DirectTransport::~DirectTransport() { StopSending(); }
44 35
45 void DirectTransport::SetConfig(const FakeNetworkPipe::Config& config) { 36 void DirectTransport::SetConfig(const FakeNetworkPipe::Config& config) {
46 fake_network_.SetConfig(config); 37 fake_network_.SetConfig(config);
47 } 38 }
48 39
49 void DirectTransport::StopSending() { 40 void DirectTransport::StopSending() {
50 { 41 {
51 rtc::CritScope crit(&lock_); 42 rtc::CritScope crit(&lock_);
52 shutting_down_ = true; 43 shutting_down_ = true;
53 } 44 }
54 45
55 packet_event_->Set(); 46 packet_event_->Set();
56 EXPECT_TRUE(thread_->Stop()); 47 thread_.Stop();
57 } 48 }
58 49
59 void DirectTransport::SetReceiver(PacketReceiver* receiver) { 50 void DirectTransport::SetReceiver(PacketReceiver* receiver) {
60 fake_network_.SetReceiver(receiver); 51 fake_network_.SetReceiver(receiver);
61 } 52 }
62 53
63 bool DirectTransport::SendRtp(const uint8_t* data, 54 bool DirectTransport::SendRtp(const uint8_t* data,
64 size_t length, 55 size_t length,
65 const PacketOptions& options) { 56 const PacketOptions& options) {
66 if (send_call_) { 57 if (send_call_) {
(...skipping 28 matching lines...) Expand all
95 case kEventError: 86 case kEventError:
96 // TODO(pbos): Log a warning here? 87 // TODO(pbos): Log a warning here?
97 return true; 88 return true;
98 } 89 }
99 } 90 }
100 rtc::CritScope crit(&lock_); 91 rtc::CritScope crit(&lock_);
101 return shutting_down_ ? false : true; 92 return shutting_down_ ? false : true;
102 } 93 }
103 } // namespace test 94 } // namespace test
104 } // namespace webrtc 95 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/direct_transport.h ('k') | webrtc/test/fake_audio_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698