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 #include "webrtc/engine_configurations.h" | 11 #include "webrtc/engine_configurations.h" |
12 | 12 |
13 #if defined(CARBON_RENDERING) | 13 #if defined(CARBON_RENDERING) |
14 | 14 |
15 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ | 15 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ |
16 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ | 16 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ |
17 | 17 |
| 18 #include "webrtc/base/platform_thread.h" |
18 #include "webrtc/modules/video_render/video_render_defines.h" | 19 #include "webrtc/modules/video_render/video_render_defines.h" |
19 #include "webrtc/system_wrappers/include/thread_wrapper.h" | |
20 | 20 |
21 #define NEW_HIVIEW_PARENT_EVENT_HANDLER 1 | 21 #define NEW_HIVIEW_PARENT_EVENT_HANDLER 1 |
22 #define NEW_HIVIEW_EVENT_HANDLER 1 | 22 #define NEW_HIVIEW_EVENT_HANDLER 1 |
23 #define USE_STRUCT_RGN | 23 #define USE_STRUCT_RGN |
24 | 24 |
25 #include <AGL/agl.h> | 25 #include <AGL/agl.h> |
26 #include <Carbon/Carbon.h> | 26 #include <Carbon/Carbon.h> |
27 #include <OpenGL/OpenGL.h> | 27 #include <OpenGL/OpenGL.h> |
28 #include <OpenGL/glext.h> | 28 #include <OpenGL/glext.h> |
29 #include <OpenGL/glu.h> | 29 #include <OpenGL/glu.h> |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 static pascal OSStatus sHandleWindowResized( | 135 static pascal OSStatus sHandleWindowResized( |
136 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); | 136 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); |
137 static pascal OSStatus sHandleHiViewResized( | 137 static pascal OSStatus sHandleHiViewResized( |
138 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); | 138 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); |
139 | 139 |
140 HIViewRef _hiviewRef; | 140 HIViewRef _hiviewRef; |
141 WindowRef _windowRef; | 141 WindowRef _windowRef; |
142 bool _fullScreen; | 142 bool _fullScreen; |
143 int _id; | 143 int _id; |
144 webrtc::CriticalSectionWrapper& _renderCritSec; | 144 webrtc::CriticalSectionWrapper& _renderCritSec; |
145 rtc::scoped_ptr<webrtc::ThreadWrapper> _screenUpdateThread; | 145 rtc::scoped_ptr<webrtc::PlatformThread> _screenUpdateThread; |
146 webrtc::EventWrapper* _screenUpdateEvent; | 146 webrtc::EventWrapper* _screenUpdateEvent; |
147 bool _isHIViewRef; | 147 bool _isHIViewRef; |
148 AGLContext _aglContext; | 148 AGLContext _aglContext; |
149 int _windowWidth; | 149 int _windowWidth; |
150 int _windowHeight; | 150 int _windowHeight; |
151 int _lastWindowWidth; | 151 int _lastWindowWidth; |
152 int _lastWindowHeight; | 152 int _lastWindowHeight; |
153 int _lastHiViewWidth; | 153 int _lastHiViewWidth; |
154 int _lastHiViewHeight; | 154 int _lastHiViewHeight; |
155 int _currentParentWindowHeight; | 155 int _currentParentWindowHeight; |
(...skipping 11 matching lines...) Expand all Loading... |
167 HIRect _currentViewBounds; | 167 HIRect _currentViewBounds; |
168 HIRect _lastViewBounds; | 168 HIRect _lastViewBounds; |
169 bool _renderingIsPaused; | 169 bool _renderingIsPaused; |
170 }; | 170 }; |
171 | 171 |
172 } // namespace webrtc | 172 } // namespace webrtc |
173 | 173 |
174 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ | 174 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ |
175 | 175 |
176 #endif // CARBON_RENDERING | 176 #endif // CARBON_RENDERING |
OLD | NEW |