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 |
(...skipping 11 matching lines...) Expand all Loading... |
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> |
30 #include <list> | 30 #include <list> |
31 #include <map> | 31 #include <map> |
| 32 #include <memory> |
32 | 33 |
33 class VideoRenderAGL; | 34 class VideoRenderAGL; |
34 | 35 |
35 namespace webrtc { | 36 namespace webrtc { |
36 class CriticalSectionWrapper; | 37 class CriticalSectionWrapper; |
37 class EventWrapper; | 38 class EventWrapper; |
38 | 39 |
39 class VideoChannelAGL : public VideoRenderCallback { | 40 class VideoChannelAGL : public VideoRenderCallback { |
40 public: | 41 public: |
41 | 42 |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 static pascal OSStatus sHandleWindowResized( | 136 static pascal OSStatus sHandleWindowResized( |
136 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); | 137 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); |
137 static pascal OSStatus sHandleHiViewResized( | 138 static pascal OSStatus sHandleHiViewResized( |
138 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); | 139 EventHandlerCallRef nextHandler, EventRef theEvent, void* userData); |
139 | 140 |
140 HIViewRef _hiviewRef; | 141 HIViewRef _hiviewRef; |
141 WindowRef _windowRef; | 142 WindowRef _windowRef; |
142 bool _fullScreen; | 143 bool _fullScreen; |
143 int _id; | 144 int _id; |
144 webrtc::CriticalSectionWrapper& _renderCritSec; | 145 webrtc::CriticalSectionWrapper& _renderCritSec; |
145 // TODO(pbos): Remove scoped_ptr and use PlatformThread directly. | 146 // TODO(pbos): Remove unique_ptr and use PlatformThread directly. |
146 rtc::scoped_ptr<rtc::PlatformThread> _screenUpdateThread; | 147 std::unique_ptr<rtc::PlatformThread> _screenUpdateThread; |
147 webrtc::EventWrapper* _screenUpdateEvent; | 148 webrtc::EventWrapper* _screenUpdateEvent; |
148 bool _isHIViewRef; | 149 bool _isHIViewRef; |
149 AGLContext _aglContext; | 150 AGLContext _aglContext; |
150 int _windowWidth; | 151 int _windowWidth; |
151 int _windowHeight; | 152 int _windowHeight; |
152 int _lastWindowWidth; | 153 int _lastWindowWidth; |
153 int _lastWindowHeight; | 154 int _lastWindowHeight; |
154 int _lastHiViewWidth; | 155 int _lastHiViewWidth; |
155 int _lastHiViewHeight; | 156 int _lastHiViewHeight; |
156 int _currentParentWindowHeight; | 157 int _currentParentWindowHeight; |
(...skipping 11 matching lines...) Expand all Loading... |
168 HIRect _currentViewBounds; | 169 HIRect _currentViewBounds; |
169 HIRect _lastViewBounds; | 170 HIRect _lastViewBounds; |
170 bool _renderingIsPaused; | 171 bool _renderingIsPaused; |
171 }; | 172 }; |
172 | 173 |
173 } // namespace webrtc | 174 } // namespace webrtc |
174 | 175 |
175 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ | 176 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ |
176 | 177 |
177 #endif // CARBON_RENDERING | 178 #endif // CARBON_RENDERING |
OLD | NEW |