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

Side by Side Diff: remoting/test/protocol_perftest.cc

Issue 1673723002: Use IpcVideoFrameCapturer on network thread instead of capturer thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « remoting/host/win/session_desktop_environment.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <utility> 5 #include <utility>
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 network_settings, protocol::TransportRole::SERVER)); 324 network_settings, protocol::TransportRole::SERVER));
325 scoped_ptr<protocol::SessionManager> session_manager( 325 scoped_ptr<protocol::SessionManager> session_manager(
326 new protocol::JingleSessionManager(host_signaling_.get())); 326 new protocol::JingleSessionManager(host_signaling_.get()));
327 session_manager->set_protocol_config(protocol_config_->Clone()); 327 session_manager->set_protocol_config(protocol_config_->Clone());
328 328
329 // Encoder runs on a separate thread, main thread is used for everything 329 // Encoder runs on a separate thread, main thread is used for everything
330 // else. 330 // else.
331 host_.reset(new ChromotingHost( 331 host_.reset(new ChromotingHost(
332 &desktop_environment_factory_, std::move(session_manager), 332 &desktop_environment_factory_, std::move(session_manager),
333 transport_context, host_thread_.task_runner(), 333 transport_context, host_thread_.task_runner(),
334 host_thread_.task_runner(), capture_thread_.task_runner(), 334 encode_thread_.task_runner()));
335 encode_thread_.task_runner(), host_thread_.task_runner(),
336 host_thread_.task_runner()));
337 335
338 base::FilePath certs_dir(net::GetTestCertsDirectory()); 336 base::FilePath certs_dir(net::GetTestCertsDirectory());
339 337
340 std::string host_cert; 338 std::string host_cert;
341 ASSERT_TRUE(base::ReadFileToString( 339 ASSERT_TRUE(base::ReadFileToString(
342 certs_dir.AppendASCII("unittest.selfsigned.der"), &host_cert)); 340 certs_dir.AppendASCII("unittest.selfsigned.der"), &host_cert));
343 341
344 base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin"); 342 base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin");
345 std::string key_string; 343 std::string key_string;
346 ASSERT_TRUE(base::ReadFileToString(key_path, &key_string)); 344 ASSERT_TRUE(base::ReadFileToString(key_path, &key_string));
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 630
633 TEST_P(ProtocolPerfTest, TotalLatencyIce) { 631 TEST_P(ProtocolPerfTest, TotalLatencyIce) {
634 MeasureTotalLatency(false); 632 MeasureTotalLatency(false);
635 } 633 }
636 634
637 TEST_P(ProtocolPerfTest, TotalLatencyWebrtc) { 635 TEST_P(ProtocolPerfTest, TotalLatencyWebrtc) {
638 MeasureTotalLatency(true); 636 MeasureTotalLatency(true);
639 } 637 }
640 638
641 } // namespace remoting 639 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/session_desktop_environment.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698