zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 8810 "- Add a SetPriority method to ThreadWrapper"

Browse Source 
Seeing if this is causing roll issues.

> - Add a SetPriority method to ThreadWrapper
> - Remove 'priority' from CreateThread and related member variables from implementations
> - Make supplying a name for threads, non-optional
> 
> BUG=
> R=magjed@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/44729004

TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/48609004

Cr-Commit-Position: refs/heads/master@{#8818}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8818 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org
2015-03-22 14:33:54 +00:00
parent b789f6271a
commit 90a1cb4630
49 changed files with 192 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_render/android/video_render_android_impl.cc
View File

@ -142,6 +142,7 @@ int32_t VideoRenderAndroid::StartRender() {
}
_javaRenderThread = ThreadWrapper::CreateThread(JavaRenderThreadFun, this,
kRealtimePriority,
"AndroidRenderThread");
if (_javaRenderThread->Start())
@ -152,7 +153,6 @@ int32_t VideoRenderAndroid::StartRender() {
"%s: Could not start send thread", __FUNCTION__);
return -1;
}
_javaRenderThread->SetPriority(kRealtimePriority);
return 0;
}

4
webrtc/modules/video_render/incoming_video_stream.cc
View File

@ -179,7 +179,8 @@ int32_t IncomingVideoStream::Start() {
assert(incoming_render_thread_ == NULL);
incoming_render_thread_ = ThreadWrapper::CreateThread(
IncomingVideoStreamThreadFun, this, "IncomingVideoStreamThread");
IncomingVideoStreamThreadFun, this, kRealtimePriority,
"IncomingVideoStreamThread");
if (!incoming_render_thread_) {
WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, module_id_,
"%s: No thread", __FUNCTION__);
@ -194,7 +195,6 @@ int32_t IncomingVideoStream::Start() {
"%s: Could not start send thread", __FUNCTION__);
return -1;
}
incoming_render_thread_->SetPriority(kRealtimePriority);
deliver_buffer_event_.StartTimer(false, KEventStartupTimeMS);
running_ = true;

3
webrtc/modules/video_render/ios/video_render_ios_gles20.mm
View File

@ -33,7 +33,7 @@ VideoRenderIosGles20::VideoRenderIosGles20(VideoRenderIosView* view,
gles_context_([view context]),
is_rendering_(true) {
screen_update_thread_ = ThreadWrapper::CreateThread(
ScreenUpdateThreadProc, this, "ScreenUpdateGles20");
ScreenUpdateThreadProc, this, kRealtimePriority);
screen_update_event_ = EventWrapper::Create();
GetWindowRect(window_rect_);
}
@ -83,7 +83,6 @@ int VideoRenderIosGles20::Init() {
}
screen_update_thread_->Start();
screen_update_thread_->SetPriority(kRealtimePriority);
// Start the event triggering the render process
unsigned int monitor_freq = 60;

12
webrtc/modules/video_render/mac/video_render_agl.cc
View File

@ -395,8 +395,7 @@ _renderingIsPaused( false),
{
//WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s");
_screenUpdateThread = ThreadWrapper::CreateThread(
ScreenUpdateThreadProc, this, "ScreenUpdate");
_screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc, this, kRealtimePriority);
_screenUpdateEvent = EventWrapper::Create();
if(!IsValidWindowPtr(_windowRef))
@ -512,8 +511,7 @@ _renderingIsPaused( false),
//WEBRTC_TRACE(kTraceDebug, "%s:%d Constructor", __FUNCTION__, __LINE__);
// _renderCritSec = CriticalSectionWrapper::CreateCriticalSection();
_screenUpdateThread = ThreadWrapper::CreateThread(
ScreenUpdateThreadProc, this, "ScreenUpdateThread");
_screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc, this, kRealtimePriority);
_screenUpdateEvent = EventWrapper::Create();
GetWindowRect(_windowRect);
@ -739,7 +737,6 @@ int VideoRenderAGL::Init()
return -1;
}
_screenUpdateThread->Start();
_screenUpdateThread->SetPriority(kRealtimePriority);
// Start the event triggering the render process
unsigned int monitorFreq = 60;
@ -1880,7 +1877,6 @@ int32_t VideoRenderAGL::StartRender()
UnlockAGLCntx();
return -1;
}
_screenUpdateThread->SetPriority(kRealtimePriority);
if(FALSE == _screenUpdateEvent->StartTimer(true, 1000/MONITOR_FREQ))
{
//WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, "%s:%d Failed to start screenUpdateEvent", __FUNCTION__, __LINE__);
@ -1891,8 +1887,7 @@ int32_t VideoRenderAGL::StartRender()
return 0;
}
_screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc,
this, "ScreenUpdate");
_screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc, this, kRealtimePriority);
_screenUpdateEvent = EventWrapper::Create();
if (!_screenUpdateThread)
@ -1903,7 +1898,6 @@ int32_t VideoRenderAGL::StartRender()
}
_screenUpdateThread->Start();
_screenUpdateThread->SetPriority(kRealtimePriority);
_screenUpdateEvent->StartTimer(true, 1000/MONITOR_FREQ);
//WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s:%d Started screenUpdateThread", __FUNCTION__, __LINE__);

6
webrtc/modules/video_render/mac/video_render_nsopengl.mm
View File

@ -380,8 +380,7 @@ _renderingIsPaused (FALSE),
_windowRefSuperView(NULL),
_windowRefSuperViewFrame(NSMakeRect(0,0,0,0))
{
_screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc,
this, "ScreenUpdateNSOpenGL");
_screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc, this, kRealtimePriority);
_screenUpdateEvent = EventWrapper::Create();
}
@ -438,8 +437,6 @@ int32_t VideoRenderNSOpenGL::StartRender()
return -1;
}
_screenUpdateThread->SetPriority(kRealtimePriority);
UnlockAGLCntx();
return 0;
}
@ -719,7 +716,6 @@ int VideoRenderNSOpenGL::Init()
}
_screenUpdateThread->Start();
_screenUpdateThread->SetPriority(kRealtimePriority);
// Start the event triggering the render process
unsigned int monitorFreq = 60;

5
webrtc/modules/video_render/windows/video_render_direct3d9.cc
View File

@ -295,8 +295,8 @@ VideoRenderDirect3D9::VideoRenderDirect3D9(Trace* trace,
_totalMemory(0),
_availableMemory(0)
{
_screenUpdateThread = ThreadWrapper::CreateThread(
ScreenUpdateThreadProc, this, "ScreenUpdateThread");
_screenUpdateThread = ThreadWrapper::CreateThread(ScreenUpdateThreadProc,
this, kRealtimePriority);
_screenUpdateEvent = EventWrapper::Create();
SetRect(&_originalHwndRect, 0, 0, 0, 0);
}
@ -547,7 +547,6 @@ int32_t VideoRenderDirect3D9::Init()
return -1;
}
_screenUpdateThread->Start();
_screenUpdateThread->SetPriority(kRealtimePriority);
// Start the event triggering the render process
unsigned int monitorFreq = 60;