Renamed Encoder -> VideoEncoder.

remoting/host/chromoting_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/chromoting_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
@@ skipping 205 matching lines @@
   if (reject_authenticating_client_) {
     client->Disconnect();
   }
 }
 
 void ChromotingHost::OnSessionChannelsConnected(ClientSession* client) {
   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
 
   // Then we create a ScreenRecorder passing the message loops that
   // it should run on.
-  Encoder* encoder = CreateEncoder(client->connection()->session()->config());
+  VideoEncoder* encoder =

[simonmorris, 2012/08/24 16:19:29]

encoder -> video_encoder?

[kxing, 2012/08/24 16:28:04]

Done.

+      CreateEncoder(client->connection()->session()->config());
 
   recorder_ = new ScreenRecorder(context_->capture_task_runner(),
                                  context_->encode_task_runner(),
                                  context_->network_task_runner(),
                                  desktop_environment_->capturer(),
                                  encoder);
   if (client->connection()->session()->config().is_audio_enabled()) {
     scoped_ptr<AudioEncoder> audio_encoder =
         CreateAudioEncoder(client->connection()->session()->config());
     audio_scheduler_ = new AudioScheduler(
@@ skipping 177 matching lines @@
 
 void ChromotingHost::SetUiStrings(const UiStrings& ui_strings) {
   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
   DCHECK_EQ(state_, kInitial);
 
   ui_strings_ = ui_strings;
 }
 
 // TODO(sergeyu): Move this to SessionManager?
 // static
-Encoder* ChromotingHost::CreateEncoder(const protocol::SessionConfig& config) {
+VideoEncoder* ChromotingHost::CreateEncoder(
+    const protocol::SessionConfig& config) {
   const protocol::ChannelConfig& video_config = config.video_config();
 
   if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
-    return EncoderRowBased::CreateVerbatimEncoder();
+    return VideoEncoderRowBased::CreateVerbatimEncoder();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_ZIP) {
-    return EncoderRowBased::CreateZlibEncoder();
+    return VideoEncoderRowBased::CreateZlibEncoder();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
-    return new remoting::EncoderVp8();
+    return new remoting::VideoEncoderVp8();
   }
 
   return NULL;
 }
 
 // static
 scoped_ptr<AudioEncoder> ChromotingHost::CreateAudioEncoder(
     const protocol::SessionConfig& config) {
   const protocol::ChannelConfig& audio_config = config.audio_config();
 
@@ skipping 56 matching lines @@
                     OnShutdown());
 
   for (std::vector<base::Closure>::iterator it = shutdown_tasks_.begin();
        it != shutdown_tasks_.end(); ++it) {
     it->Run();
   }
   shutdown_tasks_.clear();
 }
 
 }  // namespace remoting