Clean up PlatformThread.

webrtc/modules/video_render/mac/video_render_agl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 377 matching lines @@
 _zOrderToChannel( ),
 _hiviewEventHandlerRef( NULL),
 _windowEventHandlerRef( NULL),
 _currentViewBounds( ),
 _lastViewBounds( ),
 _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))
     {
         //WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, "%s:%d Invalid WindowRef:0x%x", __FUNCTION__, __LINE__, _windowRef);
     }
     else
     {
         //WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, _id, "%s:%d WindowRef 0x%x is valid", __FUNCTION__, __LINE__, _windowRef);
     }
@@ skipping 95 matching lines @@
 _zOrderToChannel( ),
 _hiviewEventHandlerRef( NULL),
 _windowEventHandlerRef( NULL),
 _currentViewBounds( ),
 _lastViewBounds( ),
 _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);
 
     _lastViewBounds.origin.x = 0;
     _lastViewBounds.origin.y = 0;
     _lastViewBounds.size.width = 0;
     _lastViewBounds.size.height = 0;
 
 #ifdef NEW_HIVIEW_PARENT_EVENT_HANDLER
@@ skipping 143 matching lines @@
     {
         status = RemoveEventHandler(_hiviewEventHandlerRef);
         if(status != noErr)
         {
             //WEBRTC_TRACE(kTraceDebug, "%s:%d Failed to remove hiview event handler: %d", __FUNCTION__, __LINE__, (int)_hiviewEventHandlerRef);
         }
     }
 #endif
 
     // Signal event to exit thread, then delete it
-    PlatformThread* tmpPtr = _screenUpdateThread.release();
+    rtc::PlatformThread* tmpPtr = _screenUpdateThread.release();
 
     if (tmpPtr)
     {
         _screenUpdateEvent->Set();
         _screenUpdateEvent->StopTimer();
 
         tmpPtr->Stop();
         delete tmpPtr;
         delete _screenUpdateEvent;
         _screenUpdateEvent = NULL;
@@ skipping 41 matching lines @@
     LockAGLCntx();
 
     // Start rendering thread...
     if (!_screenUpdateThread)
     {
         UnlockAGLCntx();
         //WEBRTC_TRACE(kTraceError, "%s:%d Thread not created", __FUNCTION__, __LINE__);
         return -1;
     }
     _screenUpdateThread->Start();
-    _screenUpdateThread->SetPriority(kRealtimePriority);
+    _screenUpdateThread->SetPriority(rtc::kRealtimePriority);
 
     // Start the event triggering the render process
     unsigned int monitorFreq = 60;
     _screenUpdateEvent->StartTimer(true, 1000/monitorFreq);
 
     // Create mixing textures
     if (CreateMixingContext() == -1)
     {
         //WEBRTC_TRACE(kTraceError, "%s:%d Could not create a mixing context", __FUNCTION__, __LINE__);
         UnlockAGLCntx();
@@ skipping 96 matching lines @@
         }
         zIt++;// = _zOrderToChannel.begin();
     }
 
     return 0;
 }
 
 int VideoRenderAGL::StopThread()
 {
     CriticalSectionScoped cs(&_renderCritSec);
-    PlatformThread* tmpPtr = _screenUpdateThread.release();
+    rtc::PlatformThread* tmpPtr = _screenUpdateThread.release();
 
     if (tmpPtr)
     {
         _screenUpdateEvent->Set();
         _renderCritSec.Leave();
         tmpPtr->Stop();
         delete tmpPtr;
         _renderCritSec.Enter();
     }
 
@@ skipping 1003 matching lines @@
     {
         //WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s:%d Rendering is paused. Restarting now", __FUNCTION__, __LINE__);
 
         // we already have the thread. Most likely StopRender() was called and they were paused
         if(FALSE == _screenUpdateThread->Start())
         {
             //WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, "%s:%d Failed to start screenUpdateThread", __FUNCTION__, __LINE__);
             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__);
             UnlockAGLCntx();
             return -1;
         }
 
         return 0;
     }
 
-    _screenUpdateThread = PlatformThread::CreateThread(ScreenUpdateThreadProc,
-                                                       this, "ScreenUpdate");
+    _screenUpdateThread.reset(
+        new rtc::PlatformThread(ScreenUpdateThreadProc, this, "ScreenUpdate"));
     _screenUpdateEvent = EventWrapper::Create();
 
     if (!_screenUpdateThread)
     {
         //WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, "%s:%d Failed to start screenUpdateThread", __FUNCTION__, __LINE__);
         UnlockAGLCntx();
         return -1;
     }
 
     _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()
 {
     LockAGLCntx();
 
     if(!_screenUpdateThread || !_screenUpdateEvent)
     {
         _renderingIsPaused = TRUE;
         UnlockAGLCntx();
@@ skipping 55 matching lines @@
     _renderCritSec.Enter();
 }
 void VideoRenderAGL::UnlockAGLCntx()
 {
     _renderCritSec.Leave();
 }
 
 }  // namespace webrtc
 
 #endif   // CARBON_RENDERING