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

Side by Side Diff: remoting/host/simple_host_process.cc

Issue 7657005: Roll ffmpeg/libvpx deps to switch to ffvp8. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This is an application of a minimal host process in a Chromoting 5 // This is an application of a minimal host process in a Chromoting
6 // system. It serves the purpose of gluing different pieces together 6 // system. It serves the purpose of gluing different pieces together
7 // to make a functional host process for testing. 7 // to make a functional host process for testing.
8 // 8 //
9 // It peforms the following functionality: 9 // It peforms the following functionality:
10 // 1. Connect to the GTalk network and register the machine as a host. 10 // 1. Connect to the GTalk network and register the machine as a host.
(...skipping 14 matching lines...) Expand all
25 #include "base/command_line.h" 25 #include "base/command_line.h"
26 #include "base/environment.h" 26 #include "base/environment.h"
27 #include "base/file_path.h" 27 #include "base/file_path.h"
28 #include "base/logging.h" 28 #include "base/logging.h"
29 #include "base/mac/scoped_nsautorelease_pool.h" 29 #include "base/mac/scoped_nsautorelease_pool.h"
30 #include "base/message_loop.h" 30 #include "base/message_loop.h"
31 #include "base/path_service.h" 31 #include "base/path_service.h"
32 #include "base/test/mock_chrome_application_mac.h" 32 #include "base/test/mock_chrome_application_mac.h"
33 #include "base/threading/thread.h" 33 #include "base/threading/thread.h"
34 #include "crypto/nss_util.h" 34 #include "crypto/nss_util.h"
35 #include "media/base/media.h"
36 #include "remoting/base/constants.h" 35 #include "remoting/base/constants.h"
37 #include "remoting/base/tracer.h" 36 #include "remoting/base/tracer.h"
38 #include "remoting/host/capturer_fake.h" 37 #include "remoting/host/capturer_fake.h"
39 #include "remoting/host/chromoting_host.h" 38 #include "remoting/host/chromoting_host.h"
40 #include "remoting/host/chromoting_host_context.h" 39 #include "remoting/host/chromoting_host_context.h"
41 #include "remoting/host/continue_window.h" 40 #include "remoting/host/continue_window.h"
42 #include "remoting/host/curtain.h" 41 #include "remoting/host/curtain.h"
43 #include "remoting/host/desktop_environment.h" 42 #include "remoting/host/desktop_environment.h"
44 #include "remoting/host/disconnect_window.h" 43 #include "remoting/host/disconnect_window.h"
45 #include "remoting/host/event_executor.h" 44 #include "remoting/host/event_executor.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 // Needed for the Mac, so we don't leak objects when threads are created. 270 // Needed for the Mac, so we don't leak objects when threads are created.
272 base::mac::ScopedNSAutoreleasePool pool; 271 base::mac::ScopedNSAutoreleasePool pool;
273 272
274 CommandLine::Init(argc, argv); 273 CommandLine::Init(argc, argv);
275 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 274 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
276 275
277 base::AtExitManager exit_manager; 276 base::AtExitManager exit_manager;
278 crypto::EnsureNSPRInit(); 277 crypto::EnsureNSPRInit();
279 278
280 FilePath media_module_path; 279 FilePath media_module_path;
281 PathService::Get(base::DIR_MODULE, &media_module_path); 280 PathService::Get(base::DIR_MODULE, &media_module_path);
Wez 2011/08/17 00:54:07 This can go, too; we only fetch the module directo
scherkus (not reviewing) 2011/08/17 02:59:36 Done.
282 CHECK(media::InitializeMediaLibrary(media_module_path))
283 << "Cannot load media library";
284 281
285 #if defined(TOOLKIT_USES_GTK) 282 #if defined(TOOLKIT_USES_GTK)
286 gfx::GtkInitFromCommandLine(*cmd_line); 283 gfx::GtkInitFromCommandLine(*cmd_line);
287 #endif // TOOLKIT_USES_GTK 284 #endif // TOOLKIT_USES_GTK
288 285
289 #if defined(OS_MACOSX) 286 #if defined(OS_MACOSX)
290 mock_cr_app::RegisterMockCrApp(); 287 mock_cr_app::RegisterMockCrApp();
291 #endif // OS_MACOSX 288 #endif // OS_MACOSX
292 289
293 SimpleHost simple_host; 290 SimpleHost simple_host;
(...skipping 26 matching lines...) Expand all
320 LOG(ERROR) << "Unknown video codec: " << video_codec; 317 LOG(ERROR) << "Unknown video codec: " << video_codec;
321 return 1; 318 return 1;
322 } 319 }
323 config->mutable_video_configs()->push_back(ChannelConfig( 320 config->mutable_video_configs()->push_back(ChannelConfig(
324 transport, remoting::protocol::kDefaultStreamVersion, codec)); 321 transport, remoting::protocol::kDefaultStreamVersion, codec));
325 simple_host.set_protocol_config(config.release()); 322 simple_host.set_protocol_config(config.release());
326 } 323 }
327 324
328 return simple_host.Run(); 325 return simple_host.Run();
329 } 326 }
OLDNEW
« no previous file with comments | « DEPS ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698