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

Side by Side Diff: content/gpu/gpu_main.cc

Issue 2172703002: Revert of H264 HW encode using MediaFoundation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | media/base/media_switches.h » ('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) 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdlib.h> 6 #include <stdlib.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 #if defined(OS_ANDROID) 53 #if defined(OS_ANDROID)
54 #include "base/trace_event/memory_dump_manager.h" 54 #include "base/trace_event/memory_dump_manager.h"
55 #include "components/tracing/common/graphics_memory_dump_provider_android.h" 55 #include "components/tracing/common/graphics_memory_dump_provider_android.h"
56 #endif 56 #endif
57 57
58 #if defined(OS_WIN) 58 #if defined(OS_WIN)
59 #include "base/win/scoped_com_initializer.h" 59 #include "base/win/scoped_com_initializer.h"
60 #include "base/win/windows_version.h" 60 #include "base/win/windows_version.h"
61 #include "media/gpu/dxva_video_decode_accelerator_win.h" 61 #include "media/gpu/dxva_video_decode_accelerator_win.h"
62 #include "media/gpu/media_foundation_video_encode_accelerator_win.h"
63 #include "sandbox/win/src/sandbox.h" 62 #include "sandbox/win/src/sandbox.h"
64 #endif 63 #endif
65 64
66 #if defined(USE_X11) 65 #if defined(USE_X11)
67 #include "ui/base/x/x11_util.h" // nogncheck 66 #include "ui/base/x/x11_util.h" // nogncheck
68 #include "ui/gfx/x/x11_switches.h" // nogncheck 67 #include "ui/gfx/x/x11_switches.h" // nogncheck
69 #endif 68 #endif
70 69
71 #if defined(OS_LINUX) 70 #if defined(OS_LINUX)
72 #include "content/public/common/sandbox_init.h" 71 #include "content/public/common/sandbox_init.h"
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 bool WarmUpSandbox(const base::CommandLine& command_line) { 482 bool WarmUpSandbox(const base::CommandLine& command_line) {
484 { 483 {
485 TRACE_EVENT0("gpu", "Warm up rand"); 484 TRACE_EVENT0("gpu", "Warm up rand");
486 // Warm up the random subsystem, which needs to be done pre-sandbox on all 485 // Warm up the random subsystem, which needs to be done pre-sandbox on all
487 // platforms. 486 // platforms.
488 (void) base::RandUint64(); 487 (void) base::RandUint64();
489 } 488 }
490 489
491 #if defined(OS_WIN) 490 #if defined(OS_WIN)
492 media::DXVAVideoDecodeAccelerator::PreSandboxInitialization(); 491 media::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
493 media::MediaFoundationVideoEncodeAccelerator::PreSandboxInitialization();
494 #endif 492 #endif
495 return true; 493 return true;
496 } 494 }
497 495
498 #if !defined(OS_MACOSX) 496 #if !defined(OS_MACOSX)
499 bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { 497 bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
500 TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); 498 TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
501 499
502 bool res = true; 500 bool res = true;
503 gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info); 501 gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 return true; 619 return true;
622 } 620 }
623 621
624 return false; 622 return false;
625 } 623 }
626 #endif // defined(OS_WIN) 624 #endif // defined(OS_WIN)
627 625
628 } // namespace. 626 } // namespace.
629 627
630 } // namespace content 628 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698