diff options
| -rw-r--r-- | remoting/client/rectangle_update_decoder.cc | 7 | ||||
| -rw-r--r-- | remoting/host/chromoting_host.cc | 6 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 16 |
3 files changed, 3 insertions, 26 deletions
diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc index 5476011..aabbecf 100644 --- a/remoting/client/rectangle_update_decoder.cc +++ b/remoting/client/rectangle_update_decoder.cc @@ -64,12 +64,9 @@ void RectangleUpdateDecoder::Initialize(const SessionConfig* config) { } else if (codec == ChannelConfig::CODEC_ZIP) { TraceContext::tracer()->PrintString("Creating Zlib decoder"); decoder_.reset(DecoderRowBased::CreateZlibDecoder()); - // TODO(sergeyu): Enable VP8 on ARM builds. -#if !defined(ARCH_CPU_ARM_FAMILY) } else if (codec == ChannelConfig::CODEC_VP8) { - TraceContext::tracer()->PrintString("Creating VP8 decoder"); - decoder_.reset(new DecoderVp8()); -#endif + TraceContext::tracer()->PrintString("Creating VP8 decoder"); + decoder_.reset(new DecoderVp8()); } else { NOTREACHED() << "Invalid Encoding found: " << codec; } diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 1d42059..1aeaae7 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -415,13 +415,9 @@ Encoder* ChromotingHost::CreateEncoder(const protocol::SessionConfig* config) { return EncoderRowBased::CreateVerbatimEncoder(); } else if (video_config.codec == protocol::ChannelConfig::CODEC_ZIP) { return EncoderRowBased::CreateZlibEncoder(); - } - // TODO(sergeyu): Enable VP8 on ARM builds. -#if !defined(ARCH_CPU_ARM_FAMILY) - else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) { + } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) { return new remoting::EncoderVp8(); } -#endif return NULL; } diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 5391895..4d44ce1 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -338,16 +338,6 @@ 'base/util.cc', 'base/util.h', ], - 'conditions': [ - ['target_arch=="arm"', { - 'sources!': [ - 'base/decoder_vp8.cc', - 'base/decoder_vp8.h', - 'base/encoder_vp8.cc', - 'base/encoder_vp8.h', - ], - }], - ], }, # end of target 'remoting_base' { @@ -820,12 +810,6 @@ ], ], }], - ['target_arch=="arm"', { - 'sources!': [ - 'base/decoder_vp8_unittest.cc', - 'base/encoder_vp8_unittest.cc', - ], - }], ], # end of 'conditions' }, # end of target 'remoting_unittests' ], # end of targets |