OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 | 137 |
138 // Map with streams to render. | 138 // Map with streams to render. |
139 typedef std::map<int32_t, AndroidStream*> AndroidStreamMap; | 139 typedef std::map<int32_t, AndroidStream*> AndroidStreamMap; |
140 AndroidStreamMap _streamsMap; | 140 AndroidStreamMap _streamsMap; |
141 // True if the _javaRenderThread thread shall be detached from the JVM. | 141 // True if the _javaRenderThread thread shall be detached from the JVM. |
142 bool _javaShutDownFlag; | 142 bool _javaShutDownFlag; |
143 EventWrapper& _javaShutdownEvent; | 143 EventWrapper& _javaShutdownEvent; |
144 EventWrapper& _javaRenderEvent; | 144 EventWrapper& _javaRenderEvent; |
145 int64_t _lastJavaRenderEvent; | 145 int64_t _lastJavaRenderEvent; |
146 JNIEnv* _javaRenderJniEnv; // JNIEnv for the java render thread. | 146 JNIEnv* _javaRenderJniEnv; // JNIEnv for the java render thread. |
147 rtc::scoped_ptr<PlatformThread> _javaRenderThread; | 147 // TODO(pbos): Remove scoped_ptr and use the member directly. |
| 148 rtc::scoped_ptr<rtc::PlatformThread> _javaRenderThread; |
148 }; | 149 }; |
149 | 150 |
150 } // namespace webrtc | 151 } // namespace webrtc |
151 | 152 |
152 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_
IMPL_H_ | 153 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_
IMPL_H_ |
OLD | NEW |