| Index: webrtc/modules/video_render/mac/video_render_agl.cc
|
| diff --git a/webrtc/modules/video_render/mac/video_render_agl.cc b/webrtc/modules/video_render/mac/video_render_agl.cc
|
| index 32fa60739cd08dfcdf45a1923b945bb293b74616..3243563b2bf901e1e268637273247fa0e72ba3f2 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 = PlatformThread::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 = PlatformThread::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
|
| - PlatformThread* 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);
|
| - PlatformThread* 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 = PlatformThread::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()
|
|
|