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

Unified Diff: remoting/host/chromoting_host.cc

Issue 10870071: Renamed Encoder -> VideoEncoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/chromoting_host.h ('k') | remoting/host/screen_recorder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index d70085fb4cfeb11b6e2b79e014fb999753379b5c..9a9abee43c591ea9728d257d29b1bc55a1c25eb9 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -223,13 +223,14 @@ void ChromotingHost::OnSessionChannelsConnected(ClientSession* client) {
// Then we create a ScreenRecorder passing the message loops that
// it should run on.
- Encoder* encoder = CreateEncoder(client->connection()->session()->config());
+ VideoEncoder* video_encoder =
+ CreateVideoEncoder(client->connection()->session()->config());
recorder_ = new ScreenRecorder(context_->capture_task_runner(),
context_->encode_task_runner(),
context_->network_task_runner(),
desktop_environment_->capturer(),
- encoder);
+ video_encoder);
if (client->connection()->session()->config().is_audio_enabled()) {
scoped_ptr<AudioEncoder> audio_encoder =
CreateAudioEncoder(client->connection()->session()->config());
@@ -421,15 +422,16 @@ void ChromotingHost::SetUiStrings(const UiStrings& ui_strings) {
// TODO(sergeyu): Move this to SessionManager?
// static
-Encoder* ChromotingHost::CreateEncoder(const protocol::SessionConfig& config) {
+VideoEncoder* ChromotingHost::CreateVideoEncoder(
+ 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;
« no previous file with comments | « remoting/host/chromoting_host.h ('k') | remoting/host/screen_recorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698