admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing race condition in IncomingVideoStream.

Browse Source 
This really only happens on the memcheck bot. But the issue is that
the render thread may be started before the timer is started on
the main thread, which incorrectly attaches the timer to the render
thread. Then a thread check assertion occurs when the timer is
stopped on the main thread.

Simply starting the timer before starting the render thread fixes this.

BUG=webrtc:6062
TBR=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/2105013002 .

Cr-Commit-Position: refs/heads/master@{#13317}
This commit is contained in:
Taylor Brandstetter 2016-06-28 10:46:35 -07:00
parent a3c51ea9f4
commit 65f47275cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/common_video/incoming_video_stream.cc
View File

@ -30,9 +30,9 @@ IncomingVideoStream::IncomingVideoStream(
render_thread_checker_.DetachFromThread();
deliver_buffer_event_->StartTimer(false, kEventStartupTimeMs);
incoming_render_thread_.Start();
incoming_render_thread_.SetPriority(rtc::kRealtimePriority);
deliver_buffer_event_->StartTimer(false, kEventStartupTimeMs);
}
IncomingVideoStream::~IncomingVideoStream() {