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 #include <ddraw.h> | 17 #include <ddraw.h> |
18 | 18 |
19 #include <Map> | 19 #include <Map> |
20 | 20 |
21 // Added | 21 // Added |
| 22 #include "webrtc/base/platform_thread.h" |
22 #include "webrtc/modules/video_render/video_render_defines.h" | 23 #include "webrtc/modules/video_render/video_render_defines.h" |
23 #include "webrtc/system_wrappers/include/thread_wrapper.h" | |
24 | 24 |
25 #pragma comment(lib, "d3d9.lib") // located in DirectX SDK | 25 #pragma comment(lib, "d3d9.lib") // located in DirectX SDK |
26 | 26 |
27 namespace webrtc { | 27 namespace webrtc { |
28 class CriticalSectionWrapper; | 28 class CriticalSectionWrapper; |
29 class EventTimerWrapper; | 29 class EventTimerWrapper; |
30 class Trace; | 30 class Trace; |
31 | 31 |
32 class D3D9Channel: public VideoRenderCallback | 32 class D3D9Channel: public VideoRenderCallback |
33 { | 33 { |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 int CloseDevice(); | 196 int CloseDevice(); |
197 | 197 |
198 // Transparent related functions | 198 // Transparent related functions |
199 int SetTransparentColor(LPDIRECT3DTEXTURE9 pTexture, | 199 int SetTransparentColor(LPDIRECT3DTEXTURE9 pTexture, |
200 DDCOLORKEY* transparentColorKey, | 200 DDCOLORKEY* transparentColorKey, |
201 DWORD width, | 201 DWORD width, |
202 DWORD height); | 202 DWORD height); |
203 | 203 |
204 CriticalSectionWrapper& _refD3DCritsect; | 204 CriticalSectionWrapper& _refD3DCritsect; |
205 Trace* _trace; | 205 Trace* _trace; |
206 rtc::scoped_ptr<ThreadWrapper> _screenUpdateThread; | 206 rtc::scoped_ptr<PlatformThread> _screenUpdateThread; |
207 EventTimerWrapper* _screenUpdateEvent; | 207 EventTimerWrapper* _screenUpdateEvent; |
208 | 208 |
209 HWND _hWnd; | 209 HWND _hWnd; |
210 bool _fullScreen; | 210 bool _fullScreen; |
211 RECT _originalHwndRect; | 211 RECT _originalHwndRect; |
212 //FIXME we probably don't need this since all the information can be get fro
m _d3dChannels | 212 //FIXME we probably don't need this since all the information can be get fro
m _d3dChannels |
213 int _channel; | 213 int _channel; |
214 //Window size | 214 //Window size |
215 UINT _winWidth; | 215 UINT _winWidth; |
216 UINT _winHeight; | 216 UINT _winHeight; |
(...skipping 27 matching lines...) Expand all Loading... |
244 float stopWidth, float stopHeight); | 244 float stopWidth, float stopHeight); |
245 | 245 |
246 //code for providing graphics settings | 246 //code for providing graphics settings |
247 DWORD _totalMemory; | 247 DWORD _totalMemory; |
248 DWORD _availableMemory; | 248 DWORD _availableMemory; |
249 }; | 249 }; |
250 | 250 |
251 } // namespace webrtc | 251 } // namespace webrtc |
252 | 252 |
253 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9
_H_ | 253 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9
_H_ |
OLD | NEW |