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 // The bulk of this file is support code; sorry about that. Here's an overview | 5 // The bulk of this file is support code; sorry about that. Here's an overview |
6 // to hopefully help readers of this code: | 6 // to hopefully help readers of this code: |
7 // - RenderingHelper is charged with interacting with X11, EGL, and GLES2. | 7 // - RenderingHelper is charged with interacting with X11, EGL, and GLES2. |
8 // - ClientState is an enum for the state of the decode client used by the test. | 8 // - ClientState is an enum for the state of the decode client used by the test. |
9 // - ClientStateNotification is a barrier abstraction that allows the test code | 9 // - ClientStateNotification is a barrier abstraction that allows the test code |
10 // to be written sequentially and wait for the decode client to see certain | 10 // to be written sequentially and wait for the decode client to see certain |
(...skipping 27 matching lines...) Expand all Loading... | |
38 #include "base/synchronization/waitable_event.h" | 38 #include "base/synchronization/waitable_event.h" |
39 #include "base/threading/thread.h" | 39 #include "base/threading/thread.h" |
40 #include "base/utf_string_conversions.h" | 40 #include "base/utf_string_conversions.h" |
41 | 41 |
42 #if (!defined(OS_CHROMEOS) || !defined(ARCH_CPU_ARMEL)) && !defined(OS_WIN) | 42 #if (!defined(OS_CHROMEOS) || !defined(ARCH_CPU_ARMEL)) && !defined(OS_WIN) |
43 #error The VideoAccelerator tests are only supported on cros/ARM/Windows. | 43 #error The VideoAccelerator tests are only supported on cros/ARM/Windows. |
44 #endif | 44 #endif |
45 | 45 |
46 #if defined(OS_WIN) | 46 #if defined(OS_WIN) |
47 #include "content/common/gpu/media/dxva_video_decode_accelerator.h" | 47 #include "content/common/gpu/media/dxva_video_decode_accelerator.h" |
48 #include "third_party/angle/include/EGL/egl.h" | |
Ami GONE FROM CHROMIUM
2012/02/18 00:00:25
I think this move should be reverted if you take m
| |
49 #include "third_party/angle/include/GLES2/gl2.h" | |
48 #else // OS_WIN | 50 #else // OS_WIN |
49 #include "content/common/gpu/media/omx_video_decode_accelerator.h" | 51 #include "content/common/gpu/media/omx_video_decode_accelerator.h" |
50 #endif // defined(OS_WIN) | 52 #endif // defined(OS_WIN) |
51 | 53 |
52 #include "third_party/angle/include/EGL/egl.h" | |
53 #include "third_party/angle/include/GLES2/gl2.h" | |
54 | |
55 #if defined(OS_WIN) | 54 #if defined(OS_WIN) |
56 #include "ui/gfx/gl/gl_implementation.h" | 55 #include "ui/gfx/gl/gl_implementation.h" |
57 #endif // OS_WIN | 56 #endif // OS_WIN |
58 | 57 |
59 using media::VideoDecodeAccelerator; | 58 using media::VideoDecodeAccelerator; |
60 | 59 |
61 namespace { | 60 namespace { |
62 | 61 |
63 // Values optionally filled in from flags; see main() below. | 62 // Values optionally filled in from flags; see main() below. |
64 // The syntax of this variable is: | 63 // The syntax of this variable is: |
(...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1152 } | 1151 } |
1153 LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; | 1152 LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; |
1154 } | 1153 } |
1155 #if defined(OS_WIN) | 1154 #if defined(OS_WIN) |
1156 base::ShadowingAtExitManager at_exit_manager; | 1155 base::ShadowingAtExitManager at_exit_manager; |
1157 gfx::InitializeGLBindings(gfx::kGLImplementationEGLGLES2); | 1156 gfx::InitializeGLBindings(gfx::kGLImplementationEGLGLES2); |
1158 DXVAVideoDecodeAccelerator::PreSandboxInitialization(); | 1157 DXVAVideoDecodeAccelerator::PreSandboxInitialization(); |
1159 #endif // OS_WIN | 1158 #endif // OS_WIN |
1160 return RUN_ALL_TESTS(); | 1159 return RUN_ALL_TESTS(); |
1161 } | 1160 } |
OLD | NEW |