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

Unified Diff: remoting/host/client_session.cc

Issue 11195029: Remove ZLib codec support from chromoting host and client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/codec/video_encoder_verbatim_unittest.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session.cc
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
index 8a9b84295a254909421011425b08d6bddefc407f..a851129b8da37a8d240a38ba25817518ba21dcb8 100644
--- a/remoting/host/client_session.cc
+++ b/remoting/host/client_session.cc
@@ -11,7 +11,7 @@
#include "remoting/codec/audio_encoder_speex.h"
#include "remoting/codec/audio_encoder_verbatim.h"
#include "remoting/codec/video_encoder.h"
-#include "remoting/codec/video_encoder_row_based.h"
+#include "remoting/codec/video_encoder_verbatim.h"
#include "remoting/codec/video_encoder_vp8.h"
#include "remoting/host/audio_scheduler.h"
#include "remoting/host/desktop_environment.h"
@@ -273,9 +273,7 @@ VideoEncoder* ClientSession::CreateVideoEncoder(
const protocol::ChannelConfig& video_config = config.video_config();
if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
- return VideoEncoderRowBased::CreateVerbatimEncoder();
- } else if (video_config.codec == protocol::ChannelConfig::CODEC_ZIP) {
- return VideoEncoderRowBased::CreateZlibEncoder();
+ return new remoting::VideoEncoderVerbatim();
} else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
return new remoting::VideoEncoderVp8();
}
« no previous file with comments | « remoting/codec/video_encoder_verbatim_unittest.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698