diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-01-20 17:01:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-20 17:01:36 +0000 |
| commit | 9a337512d97e37afc142dee4fd50a41b741a87d2 (patch) | |
| tree | 28c4cf735dd5bd9cc8f1ccd06fff8a173b20d1cb /webrtc/modules/video_render/android/video_render_android_impl.h | |
| parent | fe8b4a657979b49e1701bd92f6d5814a99e0b2be (diff) | |
| parent | daef292e03c8d7d32e650495612f336c1830013a (diff) | |
| download | webrtc-9a337512d97e37afc142dee4fd50a41b741a87d2.tar.gz | |
Merge "Merge upstream SHA 04cb763"
Diffstat (limited to 'webrtc/modules/video_render/android/video_render_android_impl.h')
| -rw-r--r-- | webrtc/modules/video_render/android/video_render_android_impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webrtc/modules/video_render/android/video_render_android_impl.h b/webrtc/modules/video_render/android/video_render_android_impl.h index 34950db7d1..e5b7de4643 100644 --- a/webrtc/modules/video_render/android/video_render_android_impl.h +++ b/webrtc/modules/video_render/android/video_render_android_impl.h @@ -15,8 +15,8 @@ #include <map> +#include "webrtc/base/platform_thread.h" #include "webrtc/modules/video_render/i_video_render.h" -#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { @@ -144,7 +144,8 @@ class VideoRenderAndroid: IVideoRender { EventWrapper& _javaRenderEvent; int64_t _lastJavaRenderEvent; JNIEnv* _javaRenderJniEnv; // JNIEnv for the java render thread. - rtc::scoped_ptr<ThreadWrapper> _javaRenderThread; + // TODO(pbos): Remove scoped_ptr and use the member directly. + rtc::scoped_ptr<rtc::PlatformThread> _javaRenderThread; }; } // namespace webrtc |