diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 04:17:09 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 04:17:09 +0000 |
commit | 14fd1a60acdd439f80bdfc0aeb86761ba649db79 (patch) | |
tree | 5bfbcefbd8776ca6a4d810a75601d8bf62d91a7c /remoting/host/simple_host_process.cc | |
parent | 07f1ceeabc0cf63ed8d7ae7aa8d1ff04dda02584 (diff) | |
download | chromium_src-14fd1a60acdd439f80bdfc0aeb86761ba649db79.zip chromium_src-14fd1a60acdd439f80bdfc0aeb86761ba649db79.tar.gz chromium_src-14fd1a60acdd439f80bdfc0aeb86761ba649db79.tar.bz2 |
Add VideoReader and VideoWriter interfaces.
Implemented VideoReader and VideoWriter for RTP and Protobuf.
BUG=53986
TEST=None
Review URL: http://codereview.chromium.org/4229003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/simple_host_process.cc')
-rw-r--r-- | remoting/host/simple_host_process.cc | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc index 2733850..98d9303 100644 --- a/remoting/host/simple_host_process.cc +++ b/remoting/host/simple_host_process.cc @@ -28,9 +28,6 @@ #include "base/path_service.h" #include "base/thread.h" #include "media/base/media.h" -#include "remoting/base/encoder_verbatim.h" -#include "remoting/base/encoder_vp8.h" -#include "remoting/base/encoder_zlib.h" #include "remoting/base/tracer.h" #include "remoting/host/capturer_fake.h" #include "remoting/host/chromoting_host.h" @@ -65,8 +62,6 @@ void ShutdownTask(MessageLoop* message_loop) { const std::string kFakeSwitchName = "fake"; const std::string kConfigSwitchName = "config"; -const std::string kVerbatimSwitchName = "verbatim"; -const std::string kVp8SwitchName = "vp8"; int main(int argc, char** argv) { // Needed for the Mac, so we don't leak objects when threads are created. @@ -80,7 +75,6 @@ int main(int argc, char** argv) { base::EnsureNSPRInit(); scoped_ptr<remoting::Capturer> capturer; - scoped_ptr<remoting::Encoder> encoder; scoped_ptr<remoting::EventExecutor> event_handler; #if defined(OS_WIN) capturer.reset(new remoting::CapturerGdi()); @@ -92,12 +86,9 @@ int main(int argc, char** argv) { capturer.reset(new remoting::CapturerMac()); event_handler.reset(new remoting::EventExecutorMac(capturer.get())); #endif - encoder.reset(new remoting::EncoderZlib()); - // Check the argument to see if we should use a fake capturer and encoder. + // Check the argument to see if we should use a fake capturer. bool fake = cmd_line->HasSwitch(kFakeSwitchName); - bool verbatim = cmd_line->HasSwitch(kVerbatimSwitchName); - bool vp8 = cmd_line->HasSwitch(kVp8SwitchName); #if defined(OS_WIN) std::wstring home_path = GetEnvironmentVar(kHomeDrive); @@ -117,19 +108,6 @@ int main(int argc, char** argv) { capturer.reset(new remoting::CapturerFake()); } - if (verbatim) { - LOG(INFO) << "Using the verbatim encoder."; - encoder.reset(new remoting::EncoderVerbatim()); - } - - // TODO(sergeyu): Enable VP8 on ARM builds. -#if !defined(ARCH_CPU_ARM_FAMILY) - if (vp8) { - LOG(INFO) << "Using the verbatim encoder."; - encoder.reset(new remoting::EncoderVp8()); - } -#endif - base::Thread file_io_thread("FileIO"); file_io_thread.Start(); @@ -156,7 +134,6 @@ int main(int argc, char** argv) { new remoting::ChromotingHost(&context, config, capturer.release(), - encoder.release(), event_handler.release())); // Let the chromoting host run until the shutdown task is executed. |