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 <memory> |
| 15 |
14 #include "webrtc/modules/video_render/windows/i_video_render_win.h" | 16 #include "webrtc/modules/video_render/windows/i_video_render_win.h" |
15 | 17 |
16 #include <d3d9.h> | 18 #include <d3d9.h> |
17 #include <ddraw.h> | 19 #include <ddraw.h> |
18 | 20 |
19 #include <Map> | 21 #include <Map> |
20 | 22 |
21 // Added | 23 // Added |
22 #include "webrtc/base/platform_thread.h" | 24 #include "webrtc/base/platform_thread.h" |
23 #include "webrtc/modules/video_render/video_render_defines.h" | 25 #include "webrtc/modules/video_render/video_render_defines.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 int CloseDevice(); | 198 int CloseDevice(); |
197 | 199 |
198 // Transparent related functions | 200 // Transparent related functions |
199 int SetTransparentColor(LPDIRECT3DTEXTURE9 pTexture, | 201 int SetTransparentColor(LPDIRECT3DTEXTURE9 pTexture, |
200 DDCOLORKEY* transparentColorKey, | 202 DDCOLORKEY* transparentColorKey, |
201 DWORD width, | 203 DWORD width, |
202 DWORD height); | 204 DWORD height); |
203 | 205 |
204 CriticalSectionWrapper& _refD3DCritsect; | 206 CriticalSectionWrapper& _refD3DCritsect; |
205 Trace* _trace; | 207 Trace* _trace; |
206 // TODO(pbos): Remove scoped_ptr and use PlatformThread directly. | 208 // TODO(pbos): Remove unique_ptr and use PlatformThread directly. |
207 rtc::scoped_ptr<rtc::PlatformThread> _screenUpdateThread; | 209 std::unique_ptr<rtc::PlatformThread> _screenUpdateThread; |
208 EventTimerWrapper* _screenUpdateEvent; | 210 EventTimerWrapper* _screenUpdateEvent; |
209 | 211 |
210 HWND _hWnd; | 212 HWND _hWnd; |
211 bool _fullScreen; | 213 bool _fullScreen; |
212 RECT _originalHwndRect; | 214 RECT _originalHwndRect; |
213 //FIXME we probably don't need this since all the information can be get fro
m _d3dChannels | 215 //FIXME we probably don't need this since all the information can be get fro
m _d3dChannels |
214 int _channel; | 216 int _channel; |
215 //Window size | 217 //Window size |
216 UINT _winWidth; | 218 UINT _winWidth; |
217 UINT _winHeight; | 219 UINT _winHeight; |
(...skipping 27 matching lines...) Expand all 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 |