OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include <stdlib.h> | 5 #include <stdlib.h> |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <dwmapi.h> | 8 #include <dwmapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif | 10 #endif |
11 | 11 |
12 #include "base/debug/trace_event.h" | 12 #include "base/debug/trace_event.h" |
13 #include "base/lazy_instance.h" | 13 #include "base/lazy_instance.h" |
14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
15 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
16 #include "base/rand_util.h" | 16 #include "base/rand_util.h" |
17 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
18 #include "base/strings/stringprintf.h" | 18 #include "base/strings/stringprintf.h" |
19 #include "base/threading/platform_thread.h" | 19 #include "base/threading/platform_thread.h" |
20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
21 #include "content/child/child_process.h" | 21 #include "content/child/child_process.h" |
22 #include "content/common/content_constants_internal.h" | 22 #include "content/common/content_constants_internal.h" |
23 #include "content/common/gpu/gpu_config.h" | 23 #include "content/common/gpu/gpu_config.h" |
24 #include "content/common/gpu/gpu_messages.h" | 24 #include "content/common/gpu/gpu_messages.h" |
| 25 #include "content/common/gpu/media/gpu_video_decode_accelerator.h" |
25 #include "content/common/gpu/media/gpu_video_encode_accelerator.h" | 26 #include "content/common/gpu/media/gpu_video_encode_accelerator.h" |
26 #include "content/common/sandbox_linux/sandbox_linux.h" | 27 #include "content/common/sandbox_linux/sandbox_linux.h" |
27 #include "content/gpu/gpu_child_thread.h" | 28 #include "content/gpu/gpu_child_thread.h" |
28 #include "content/gpu/gpu_process.h" | 29 #include "content/gpu/gpu_process.h" |
29 #include "content/gpu/gpu_watchdog_thread.h" | 30 #include "content/gpu/gpu_watchdog_thread.h" |
30 #include "content/public/common/content_client.h" | 31 #include "content/public/common/content_client.h" |
31 #include "content/public/common/content_switches.h" | 32 #include "content/public/common/content_switches.h" |
32 #include "content/public/common/main_function_params.h" | 33 #include "content/public/common/main_function_params.h" |
33 #include "gpu/command_buffer/service/gpu_switches.h" | 34 #include "gpu/command_buffer/service/gpu_switches.h" |
34 #include "gpu/config/gpu_info_collector.h" | 35 #include "gpu/config/gpu_info_collector.h" |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 if (!initialized_sandbox) { | 324 if (!initialized_sandbox) { |
324 gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), | 325 gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), |
325 should_initialize_gl_context); | 326 should_initialize_gl_context); |
326 } | 327 } |
327 #elif defined(OS_WIN) | 328 #elif defined(OS_WIN) |
328 gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); | 329 gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); |
329 #elif defined(OS_MACOSX) | 330 #elif defined(OS_MACOSX) |
330 gpu_info.sandboxed = Sandbox::SandboxIsCurrentlyActive(); | 331 gpu_info.sandboxed = Sandbox::SandboxIsCurrentlyActive(); |
331 #endif | 332 #endif |
332 | 333 |
| 334 gpu_info.video_decode_accelerator_supported_resolution = |
| 335 content::GpuVideoDecodeAccelerator::GetSupportedResolution(); |
333 gpu_info.video_encode_accelerator_supported_profiles = | 336 gpu_info.video_encode_accelerator_supported_profiles = |
334 content::GpuVideoEncodeAccelerator::GetSupportedProfiles(); | 337 content::GpuVideoEncodeAccelerator::GetSupportedProfiles(); |
335 } else { | 338 } else { |
336 dead_on_arrival = true; | 339 dead_on_arrival = true; |
337 } | 340 } |
338 | 341 |
339 logging::SetLogMessageHandler(NULL); | 342 logging::SetLogMessageHandler(NULL); |
340 | 343 |
341 GpuProcess gpu_process; | 344 GpuProcess gpu_process; |
342 | 345 |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 return true; | 528 return true; |
526 } | 529 } |
527 | 530 |
528 return false; | 531 return false; |
529 } | 532 } |
530 #endif // defined(OS_WIN) | 533 #endif // defined(OS_WIN) |
531 | 534 |
532 } // namespace. | 535 } // namespace. |
533 | 536 |
534 } // namespace content | 537 } // namespace content |
OLD | NEW |