diff options
Diffstat (limited to 'webrtc/modules/video_render/mac')
4 files changed, 38 insertions, 38 deletions
diff --git a/webrtc/modules/video_render/mac/video_render_agl.cc b/webrtc/modules/video_render/mac/video_render_agl.cc index dc157d597b..3243563b2b 100644 --- a/webrtc/modules/video_render/mac/video_render_agl.cc +++ b/webrtc/modules/video_render/mac/video_render_agl.cc @@ -395,8 +395,8 @@ _renderingIsPaused( false), { //WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s"); - _screenUpdateThread = ThreadWrapper::CreateThread( - ScreenUpdateThreadProc, this, "ScreenUpdate"); + _screenUpdateThread.reset( + new rtc::PlatformThread(ScreenUpdateThreadProc, this, "ScreenUpdate")); _screenUpdateEvent = EventWrapper::Create(); if(!IsValidWindowPtr(_windowRef)) @@ -512,8 +512,8 @@ _renderingIsPaused( false), //WEBRTC_TRACE(kTraceDebug, "%s:%d Constructor", __FUNCTION__, __LINE__); // _renderCritSec = CriticalSectionWrapper::CreateCriticalSection(); - _screenUpdateThread = ThreadWrapper::CreateThread( - ScreenUpdateThreadProc, this, "ScreenUpdateThread"); + _screenUpdateThread.reset(new rtc::PlatformThread( + ScreenUpdateThreadProc, this, "ScreenUpdateThread")); _screenUpdateEvent = EventWrapper::Create(); GetWindowRect(_windowRect); @@ -677,7 +677,7 @@ VideoRenderAGL::~VideoRenderAGL() #endif // Signal event to exit thread, then delete it - ThreadWrapper* tmpPtr = _screenUpdateThread.release(); + rtc::PlatformThread* tmpPtr = _screenUpdateThread.release(); if (tmpPtr) { @@ -739,7 +739,7 @@ int VideoRenderAGL::Init() return -1; } _screenUpdateThread->Start(); - _screenUpdateThread->SetPriority(kRealtimePriority); + _screenUpdateThread->SetPriority(rtc::kRealtimePriority); // Start the event triggering the render process unsigned int monitorFreq = 60; @@ -856,7 +856,7 @@ int VideoRenderAGL::DeleteAGLChannel(int channel) int VideoRenderAGL::StopThread() { CriticalSectionScoped cs(&_renderCritSec); - ThreadWrapper* tmpPtr = _screenUpdateThread.release(); + rtc::PlatformThread* tmpPtr = _screenUpdateThread.release(); if (tmpPtr) { @@ -1880,7 +1880,7 @@ int32_t VideoRenderAGL::StartRender() UnlockAGLCntx(); return -1; } - _screenUpdateThread->SetPriority(kRealtimePriority); + _screenUpdateThread->SetPriority(rtc::kRealtimePriority); if(FALSE == _screenUpdateEvent->StartTimer(true, 1000/MONITOR_FREQ)) { //WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, "%s:%d Failed to start screenUpdateEvent", __FUNCTION__, __LINE__); @@ -1891,8 +1891,8 @@ int32_t VideoRenderAGL::StartRender() return 0; } - _screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc, - this, "ScreenUpdate"); + _screenUpdateThread.reset( + new rtc::PlatformThread(ScreenUpdateThreadProc, this, "ScreenUpdate")); _screenUpdateEvent = EventWrapper::Create(); if (!_screenUpdateThread) @@ -1903,14 +1903,13 @@ int32_t VideoRenderAGL::StartRender() } _screenUpdateThread->Start(); - _screenUpdateThread->SetPriority(kRealtimePriority); + _screenUpdateThread->SetPriority(rtc::kRealtimePriority); _screenUpdateEvent->StartTimer(true, 1000/MONITOR_FREQ); //WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s:%d Started screenUpdateThread", __FUNCTION__, __LINE__); UnlockAGLCntx(); return 0; - } int32_t VideoRenderAGL::StopRender() diff --git a/webrtc/modules/video_render/mac/video_render_agl.h b/webrtc/modules/video_render/mac/video_render_agl.h index 8710228754..e1da8faf83 100644 --- a/webrtc/modules/video_render/mac/video_render_agl.h +++ b/webrtc/modules/video_render/mac/video_render_agl.h @@ -15,8 +15,8 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ -#include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/modules/video_render/video_render_defines.h" #define NEW_HIVIEW_PARENT_EVENT_HANDLER 1 #define NEW_HIVIEW_EVENT_HANDLER 1 @@ -142,7 +142,8 @@ class VideoRenderAGL { bool _fullScreen; int _id; webrtc::CriticalSectionWrapper& _renderCritSec; - rtc::scoped_ptr<webrtc::ThreadWrapper> _screenUpdateThread; + // TODO(pbos): Remove scoped_ptr and use PlatformThread directly. + rtc::scoped_ptr<rtc::PlatformThread> _screenUpdateThread; webrtc::EventWrapper* _screenUpdateEvent; bool _isHIViewRef; AGLContext _aglContext; diff --git a/webrtc/modules/video_render/mac/video_render_nsopengl.h b/webrtc/modules/video_render/mac/video_render_nsopengl.h index 5dab4d266f..a888b68a97 100644 --- a/webrtc/modules/video_render/mac/video_render_nsopengl.h +++ b/webrtc/modules/video_render/mac/video_render_nsopengl.h @@ -23,16 +23,19 @@ #include <map> #include "webrtc/base/thread_annotations.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #import "webrtc/modules/video_render/mac/cocoa_full_screen_window.h" #import "webrtc/modules/video_render/mac/cocoa_render_view.h" class Trace; +namespace rtc { +class PlatformThread; +} // namespace rtc + namespace webrtc { class EventTimerWrapper; -class ThreadWrapper; class VideoRenderNSOpenGL; class CriticalSectionWrapper; @@ -166,7 +169,8 @@ private: // variables bool _fullScreen; int _id; CriticalSectionWrapper& _nsglContextCritSec; - rtc::scoped_ptr<ThreadWrapper> _screenUpdateThread; + // TODO(pbos): Remove scoped_ptr and use PlatformThread directly. + rtc::scoped_ptr<rtc::PlatformThread> _screenUpdateThread; EventTimerWrapper* _screenUpdateEvent; NSOpenGLContext* _nsglContext; NSOpenGLContext* _nsglFullScreenContext; diff --git a/webrtc/modules/video_render/mac/video_render_nsopengl.mm b/webrtc/modules/video_render/mac/video_render_nsopengl.mm index b5150eb668..b7683a96af 100644 --- a/webrtc/modules/video_render/mac/video_render_nsopengl.mm +++ b/webrtc/modules/video_render/mac/video_render_nsopengl.mm @@ -11,11 +11,11 @@ #include "webrtc/engine_configurations.h" #if defined(COCOA_RENDERING) +#include "webrtc/base/platform_thread.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_render/mac/video_render_nsopengl.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" namespace webrtc { @@ -378,8 +378,8 @@ _renderingIsPaused (FALSE), _windowRefSuperView(NULL), _windowRefSuperViewFrame(NSMakeRect(0,0,0,0)) { - _screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc, - this, "ScreenUpdateNSOpenGL"); + _screenUpdateThread.reset(new rtc::PlatformThread( + ScreenUpdateThreadProc, this, "ScreenUpdateNSOpenGL")); } int VideoRenderNSOpenGL::ChangeWindow(CocoaRenderView* newWindowRef) @@ -427,15 +427,15 @@ int32_t VideoRenderNSOpenGL::StartRender() WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, _id, "Restarting screenUpdateThread"); // we already have the thread. Most likely StopRender() was called and they were paused - if(FALSE == _screenUpdateThread->Start() || - FALSE == _screenUpdateEvent->StartTimer(true, 1000/MONITOR_FREQ)) - { + _screenUpdateThread->Start(); + if (FALSE == + _screenUpdateEvent->StartTimer(true, 1000 / MONITOR_FREQ)) { WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, "Failed to restart screenUpdateThread or screenUpdateEvent"); UnlockAGLCntx(); return -1; } - _screenUpdateThread->SetPriority(kRealtimePriority); + _screenUpdateThread->SetPriority(rtc::kRealtimePriority); UnlockAGLCntx(); return 0; @@ -471,8 +471,8 @@ int32_t VideoRenderNSOpenGL::StopRender() return 0; } - if(FALSE == _screenUpdateThread->Stop() || FALSE == _screenUpdateEvent->StopTimer()) - { + _screenUpdateThread->Stop(); + if (FALSE == _screenUpdateEvent->StopTimer()) { _renderingIsPaused = FALSE; UnlockAGLCntx(); @@ -657,17 +657,15 @@ VideoRenderNSOpenGL::~VideoRenderNSOpenGL() } // Signal event to exit thread, then delete it - ThreadWrapper* tmpPtr = _screenUpdateThread.release(); + rtc::PlatformThread* tmpPtr = _screenUpdateThread.release(); if (tmpPtr) { _screenUpdateEvent->Set(); _screenUpdateEvent->StopTimer(); - if (tmpPtr->Stop()) - { - delete tmpPtr; - } + tmpPtr->Stop(); + delete tmpPtr; delete _screenUpdateEvent; _screenUpdateEvent = NULL; } @@ -716,7 +714,7 @@ int VideoRenderNSOpenGL::Init() } _screenUpdateThread->Start(); - _screenUpdateThread->SetPriority(kRealtimePriority); + _screenUpdateThread->SetPriority(rtc::kRealtimePriority); // Start the event triggering the render process unsigned int monitorFreq = 60; @@ -864,17 +862,15 @@ int32_t VideoRenderNSOpenGL::GetChannelProperties(const uint16_t streamId, int VideoRenderNSOpenGL::StopThread() { - ThreadWrapper* tmpPtr = _screenUpdateThread.release(); + rtc::PlatformThread* tmpPtr = _screenUpdateThread.release(); WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s Stopping thread ", __FUNCTION__, tmpPtr); if (tmpPtr) { _screenUpdateEvent->Set(); - if (tmpPtr->Stop()) - { - delete tmpPtr; - } + tmpPtr->Stop(); + delete tmpPtr; } delete _screenUpdateEvent; |