| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "remoting/client/jni/chromoting_jni_instance.h" | 5 #include "remoting/client/jni/chromoting_jni_instance.h" |
| 6 | 6 |
| 7 #include <android/log.h> | 7 #include <android/log.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 | 301 |
| 302 NetworkSettings network_settings(NetworkSettings::NAT_TRAVERSAL_ENABLED); | 302 NetworkSettings network_settings(NetworkSettings::NAT_TRAVERSAL_ENABLED); |
| 303 | 303 |
| 304 // Use Chrome's network stack to allocate ports for peer-to-peer channels. | 304 // Use Chrome's network stack to allocate ports for peer-to-peer channels. |
| 305 scoped_ptr<ChromiumPortAllocator> port_allocator( | 305 scoped_ptr<ChromiumPortAllocator> port_allocator( |
| 306 ChromiumPortAllocator::Create(url_request_context_getter, | 306 ChromiumPortAllocator::Create(url_request_context_getter, |
| 307 network_settings)); | 307 network_settings)); |
| 308 | 308 |
| 309 scoped_ptr<protocol::TransportFactory> transport_factory( | 309 scoped_ptr<protocol::TransportFactory> transport_factory( |
| 310 new LibjingleTransportFactory( | 310 new LibjingleTransportFactory( |
| 311 port_allocator.PassAs<cricket::HttpPortAllocatorBase>(), false)); | 311 port_allocator.PassAs<cricket::HttpPortAllocatorBase>(), |
| 312 network_settings)); |
| 312 | 313 |
| 313 client_->Start(signaling_.get(), transport_factory.Pass()); | 314 client_->Start(signaling_.get(), transport_factory.Pass()); |
| 314 } | 315 } |
| 315 | 316 |
| 316 void ChromotingJniInstance::DisconnectFromHostOnNetworkThread() { | 317 void ChromotingJniInstance::DisconnectFromHostOnNetworkThread() { |
| 317 DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread()); | 318 DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread()); |
| 318 | 319 |
| 319 host_id_.clear(); | 320 host_id_.clear(); |
| 320 | 321 |
| 321 stats_logging_enabled_ = false; | 322 stats_logging_enabled_ = false; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 stats->video_decode_ms()->Average(), | 374 stats->video_decode_ms()->Average(), |
| 374 stats->video_paint_ms()->Average(), | 375 stats->video_paint_ms()->Average(), |
| 375 stats->round_trip_ms()->Average()); | 376 stats->round_trip_ms()->Average()); |
| 376 | 377 |
| 377 jni_runtime_->network_task_runner()->PostDelayedTask( | 378 jni_runtime_->network_task_runner()->PostDelayedTask( |
| 378 FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this), | 379 FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this), |
| 379 base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs)); | 380 base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs)); |
| 380 } | 381 } |
| 381 | 382 |
| 382 } // namespace remoting | 383 } // namespace remoting |
| OLD | NEW |