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

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

Issue 2774463003: Don't hardcode MediaType::ANY in FakeNetworkPipe. (Closed)
Patch Set: Update FakeCall::DeliverPacket, for consistency with Call::DeliverRtp. Created 3 years, 8 months 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_network_pipe.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 "webrtc/call/call.h" 12 #include "webrtc/call/call.h"
13 #include "webrtc/system_wrappers/include/clock.h" 13 #include "webrtc/system_wrappers/include/clock.h"
14 14
15 namespace webrtc { 15 namespace webrtc {
16 namespace test { 16 namespace test {
17 17
18 DirectTransport::DirectTransport(Call* send_call) 18 DirectTransport::DirectTransport(Call* send_call, MediaType media_type)
19 : DirectTransport(FakeNetworkPipe::Config(), send_call) {} 19 : DirectTransport(FakeNetworkPipe::Config(), send_call, media_type) {}
20 20
21 DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config, 21 DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config,
22 Call* send_call) 22 Call* send_call, MediaType media_type)
23 : send_call_(send_call), 23 : send_call_(send_call),
24 packet_event_(false, false), 24 packet_event_(false, false),
25 thread_(NetworkProcess, this, "NetworkProcess"), 25 thread_(NetworkProcess, this, "NetworkProcess"),
26 clock_(Clock::GetRealTimeClock()), 26 clock_(Clock::GetRealTimeClock()),
27 shutting_down_(false), 27 shutting_down_(false),
28 fake_network_(clock_, config) { 28 fake_network_(clock_, config, media_type) {
29 thread_.Start(); 29 thread_.Start();
30 if (send_call_) { 30 if (send_call_) {
31 send_call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp); 31 send_call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp);
32 send_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp); 32 send_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp);
33 } 33 }
34 } 34 }
35 35
36 DirectTransport::~DirectTransport() { StopSending(); } 36 DirectTransport::~DirectTransport() { StopSending(); }
37 37
38 void DirectTransport::SetConfig(const FakeNetworkPipe::Config& config) { 38 void DirectTransport::SetConfig(const FakeNetworkPipe::Config& config) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 fake_network_.Process(); 84 fake_network_.Process();
85 int64_t wait_time_ms = fake_network_.TimeUntilNextProcess(); 85 int64_t wait_time_ms = fake_network_.TimeUntilNextProcess();
86 if (wait_time_ms > 0) { 86 if (wait_time_ms > 0) {
87 packet_event_.Wait(static_cast<int>(wait_time_ms)); 87 packet_event_.Wait(static_cast<int>(wait_time_ms));
88 } 88 }
89 rtc::CritScope crit(&lock_); 89 rtc::CritScope crit(&lock_);
90 return shutting_down_ ? false : true; 90 return shutting_down_ ? false : true;
91 } 91 }
92 } // namespace test 92 } // namespace test
93 } // namespace webrtc 93 } // namespace webrtc
OLDNEW
« 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