OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9_H _ | 11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9_H _ |
12 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9_H _ | 12 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9_H _ |
13 | 13 |
14 #include "webrtc/modules/video_render/windows/i_video_render_win.h" | 14 #include "webrtc/modules/video_render/windows/i_video_render_win.h" |
15 | 15 |
16 #include <d3d9.h> | 16 #include <d3d9.h> |
17 #if _MSC_VER < 1800 | |
Peter Kasting
2015/07/10 23:37:26
Why does the MSVC version matter? If what you're
| |
17 #include <d3dx9.h> | 18 #include <d3dx9.h> |
19 #endif | |
18 #include <ddraw.h> | 20 #include <ddraw.h> |
19 | 21 |
20 #include <Map> | 22 #include <Map> |
21 | 23 |
22 // Added | 24 // Added |
23 #include "webrtc/modules/video_render/include/video_render_defines.h" | 25 #include "webrtc/modules/video_render/include/video_render_defines.h" |
24 #include "webrtc/system_wrappers/interface/thread_wrapper.h" | 26 #include "webrtc/system_wrappers/interface/thread_wrapper.h" |
25 | 27 |
26 #pragma comment(lib, "d3d9.lib") // located in DirectX SDK | 28 #pragma comment(lib, "d3d9.lib") // located in DirectX SDK |
27 | 29 |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
245 float stopWidth, float stopHeight); | 247 float stopWidth, float stopHeight); |
246 | 248 |
247 //code for providing graphics settings | 249 //code for providing graphics settings |
248 DWORD _totalMemory; | 250 DWORD _totalMemory; |
249 DWORD _availableMemory; | 251 DWORD _availableMemory; |
250 }; | 252 }; |
251 | 253 |
252 } // namespace webrtc | 254 } // namespace webrtc |
253 | 255 |
254 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9 _H_ | 256 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9 _H_ |
OLD | NEW |