| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/host/chromoting_host.h" | 5 #include "remoting/host/chromoting_host.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "base/callback.h" | 8 #include "base/callback.h" | 
| 9 #include "base/logging.h" | 9 #include "base/logging.h" | 
| 10 #include "base/message_loop_proxy.h" | 10 #include "base/message_loop_proxy.h" | 
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" | 
| 12 #include "remoting/base/constants.h" | 12 #include "remoting/base/constants.h" | 
| 13 #include "remoting/base/encoder.h" | 13 #include "remoting/base/encoder.h" | 
| 14 #include "remoting/base/encoder_row_based.h" | 14 #include "remoting/base/encoder_row_based.h" | 
| 15 #include "remoting/base/encoder_vp8.h" | 15 #include "remoting/base/encoder_vp8.h" | 
| 16 #include "remoting/codec/audio_encoder.h" | 16 #include "remoting/codec/audio_encoder.h" | 
|  | 17 #include "remoting/codec/audio_encoder_speex.h" | 
| 17 #include "remoting/codec/audio_encoder_verbatim.h" | 18 #include "remoting/codec/audio_encoder_verbatim.h" | 
| 18 #include "remoting/host/audio_scheduler.h" | 19 #include "remoting/host/audio_scheduler.h" | 
| 19 #include "remoting/host/chromoting_host_context.h" | 20 #include "remoting/host/chromoting_host_context.h" | 
| 20 #include "remoting/host/desktop_environment.h" | 21 #include "remoting/host/desktop_environment.h" | 
| 21 #include "remoting/host/event_executor.h" | 22 #include "remoting/host/event_executor.h" | 
| 22 #include "remoting/host/host_config.h" | 23 #include "remoting/host/host_config.h" | 
| 23 #include "remoting/host/screen_recorder.h" | 24 #include "remoting/host/screen_recorder.h" | 
| 24 #include "remoting/protocol/connection_to_client.h" | 25 #include "remoting/protocol/connection_to_client.h" | 
| 25 #include "remoting/protocol/client_stub.h" | 26 #include "remoting/protocol/client_stub.h" | 
| 26 #include "remoting/protocol/host_stub.h" | 27 #include "remoting/protocol/host_stub.h" | 
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 422   return NULL; | 423   return NULL; | 
| 423 } | 424 } | 
| 424 | 425 | 
| 425 // static | 426 // static | 
| 426 scoped_ptr<AudioEncoder> ChromotingHost::CreateAudioEncoder( | 427 scoped_ptr<AudioEncoder> ChromotingHost::CreateAudioEncoder( | 
| 427     const protocol::SessionConfig& config) { | 428     const protocol::SessionConfig& config) { | 
| 428   const protocol::ChannelConfig& audio_config = config.audio_config(); | 429   const protocol::ChannelConfig& audio_config = config.audio_config(); | 
| 429 | 430 | 
| 430   if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { | 431   if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { | 
| 431     return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); | 432     return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); | 
|  | 433   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_SPEEX) { | 
|  | 434     return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex()); | 
| 432   } | 435   } | 
| 433 | 436 | 
| 434   NOTIMPLEMENTED(); | 437   NOTIMPLEMENTED(); | 
| 435   return scoped_ptr<AudioEncoder>(NULL); | 438   return scoped_ptr<AudioEncoder>(NULL); | 
| 436 } | 439 } | 
| 437 | 440 | 
| 438 void ChromotingHost::StopScreenRecorder() { | 441 void ChromotingHost::StopScreenRecorder() { | 
| 439   DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); | 442   DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); | 
| 440   DCHECK(recorder_.get()); | 443   DCHECK(recorder_.get()); | 
| 441 | 444 | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 484                     OnShutdown()); | 487                     OnShutdown()); | 
| 485 | 488 | 
| 486   for (std::vector<base::Closure>::iterator it = shutdown_tasks_.begin(); | 489   for (std::vector<base::Closure>::iterator it = shutdown_tasks_.begin(); | 
| 487        it != shutdown_tasks_.end(); ++it) { | 490        it != shutdown_tasks_.end(); ++it) { | 
| 488     it->Run(); | 491     it->Run(); | 
| 489   } | 492   } | 
| 490   shutdown_tasks_.clear(); | 493   shutdown_tasks_.clear(); | 
| 491 } | 494 } | 
| 492 | 495 | 
| 493 }  // namespace remoting | 496 }  // namespace remoting | 
| OLD | NEW | 
|---|